diff --git a/python-waitress.spec b/python-waitress.spec
index 80eb53a..ce9a337 100644
--- a/python-waitress.spec
+++ b/python-waitress.spec
@@ -1,18 +1,18 @@
 %if 0%{?fedora}
 %global with_python3 1
 %endif
+%global srcname waitress
 
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
-Name:           python-waitress
+Name:           python-%{srcname}
 Version:        0.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Waitress WSGI server
 
 License:        ZPLv2.1
-URL:            https://github.com/Pylons/waitress
-Source0:        http://pypi.python.org/packages/source/w/waitress/waitress-%{version}.tar.gz
-#md5=da3f2e62b3676be5dd630703a68e2a04
+URL:            https://github.com/Pylons/%{srcname}
+Source0:        https://files.pythonhosted.org/packages/source/w/%{srcname}/%{srcname}-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -32,7 +32,7 @@ For more information, see %{_pkgdocdir}/docs or
 http://docs.pylonsproject.org/projects/waitress/en/latest/ .
 
 %if 0%{?with_python3}
-%package -n python3-waitress
+%package -n python3-%{srcname}
 Summary:        Waitress WSGI server
 Requires:       python3
 BuildArch:      noarch
@@ -42,7 +42,7 @@ BuildRequires:  python3-nose
 BuildRequires:  python3-coverage
 BuildRequires:  python3-sphinx
 
-%description -n python3-waitress
+%description -n python3-%{srcname}
 Waitress is meant to be a production-quality pure-Python WSGI server with
 very acceptable performance. It has no dependencies except ones which live
 in the Python standard library. It runs on CPython on Unix and Windows under
@@ -54,7 +54,7 @@ http://docs.pylonsproject.org/projects/waitress/en/latest/ .
 %endif
 
 %prep
-%setup -q -n waitress-%{version}
+%setup -q -n %{srcname}-%{version}
 rm -rf waitress.egg-info
 rm -f .gitignore docs/.gitignore
 # this script has devel paths, not useful in a user system
@@ -117,6 +117,9 @@ popd
 
 
 %changelog
+* Thu May 26 2016 Lorenzo Gil Sanchez <lorenzo.gil.sanchez@gmail.com> - 0.9.0-2
+- Fixed Source0 to point to new PyPi predictable URL format
+
 * Thu May 5 2016 Lorenzo Gil Sanchez <lorenzo.gil.sanchez@gmail.com> - 0.9.0-1
 - Update to 0.9.0
 - Fixed 2 warnings from fedpkg lint