diff --git a/python-bcrypt.spec b/python-bcrypt.spec
index d8993d8..4a52cd3 100644
--- a/python-bcrypt.spec
+++ b/python-bcrypt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-bcrypt
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2016, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -25,7 +25,7 @@ Summary:        Modern password hashing for your software and your servers
 License:        APL-1.0
 Group:          Development/Languages/Python
 Url:            https://github.com/pyca/bcrypt/
-Source:         https://pypi.io/packages/source/b/bcrypt/bcrypt-%{version}.tar.gz
+Source:         https://files.pythonhosted.org/packages/source/b/bcrypt/bcrypt-%{version}.tar.gz
 BuildRequires: 	python-rpm-macros
 BuildRequires:  fdupes
 BuildRequires:  %{python_module cffi}
@@ -48,25 +48,18 @@ Modern password hashing for your software and your servers.
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 %python_build 
-#python setup.py build
 
 %install
 %python_install
-#python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-%fdupes -s %{buildroot}/%{python_sitearch}
+%python_expand %fdupes %{buildroot}/%{$python_sitearch}
 
 %check
-%ifpython2
-python setup.py test
-%endif
-%ifpython3
-python3 setup.py test
-%endif
+%python_exec setup.py test
 
 %files %{python_files}
 %defattr(-,root,root,-)
 %doc LICENSE README.rst
 %{python_sitearch}/bcrypt
-%{python_sitearch}/bcrypt-%{version}-py%{py_ver}.egg-info
+%{python_sitearch}/bcrypt-%{version}-py*.egg-info
 
 %changelog