diff --git a/.gitignore b/.gitignore
index e93b7e3..8641c6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /bcrypt-3.1.2.tar.gz
 /bcrypt-3.1.3.tar.gz
 /bcrypt-3.1.4.tar.gz
+/bcrypt-3.1.6.tar.gz
diff --git a/python-bcrypt.spec b/python-bcrypt.spec
index 9ccd422..fae76b7 100644
--- a/python-bcrypt.spec
+++ b/python-bcrypt.spec
@@ -1,5 +1,5 @@
 %{!?_licensedir: %global license %%doc}
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
 %global with_python3 1
 %endif
 
@@ -8,8 +8,8 @@
 %global sum     Modern password hashing for your software and your servers
 
 Name:               python-bcrypt
-Version:            3.1.4
-Release:            7%{?dist}
+Version:            3.1.6
+Release:            1%{?dist}
 Summary:            %{sum}
 
 #crypt_blowfish code is in Public domain and all other code in ASL 2.0
@@ -77,19 +77,19 @@ Obsoletes:          python3-py-bcrypt < 0.4-11
 %autosetup -n %{modname}-%{version}
 
 %build
-%{__python2} setup.py build
+%py2_build
 
 %if 0%{?with_python3}
 %py3_build
 %endif
 
 %install
+%py2_install
+
 %if 0%{?with_python3}
 %py3_install
 %endif
 
-%{__python2} setup.py install --skip-build --root %{buildroot}
-
 # Better safe than sorry
 find %{buildroot}%{python2_sitearch} -name '*.so' -exec chmod 755 {} ';'
 
@@ -124,6 +124,9 @@ find %{buildroot}%{python3_sitearch} -name '*.so' -exec chmod 755 {} ';'
 
 
 %changelog
+* Fri Feb 08 2019 Alfredo Moralejo <amoralej@redhat.com> - 3.1.6-1
+- Update to 3.1.6.
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 87651d1..6e5aa7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bcrypt-3.1.4.tar.gz) = 885dadec10aa9c5944a68e73ebc3ba409d41517850fad1bcb61321a8ce4072b95422472b9f7ca76508e9b0d24a86e19f3e415a0713f0a1921b9d3f796089ae71
+SHA512 (bcrypt-3.1.6.tar.gz) = fcd4f3ec27ee27b4523c9f9b796e9c279895ad66d124fdabaee61b3fb27351b2e8721deb97e7bfc4f07ac4cfad6c2948d467cf21faba2af656ab0030c842244e