diff --git a/python-beaker.spec b/python-beaker.spec
index 0aae7e7ff3..2b3b7d8bb5 100644
--- a/python-beaker.spec
+++ b/python-beaker.spec
@@ -10,7 +10,7 @@
 
 Name: python-beaker
 Version: 1.5.4
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: WSGI middleware layer to provide sessions
 
 Group: Development/Languages
@@ -27,12 +27,6 @@ BuildRequires: python-setuptools
 # Needed for the test suite
 BuildRequires: python-nose
 BuildRequires: python-webtest
-Requires: python-paste
-%if 0%{?fedora}
-Requires: pycryptopp
-%else
-Requires: python-crypto
-%endif
 
 %if 0%{?with_python3}
 BuildRequires: /usr/bin/2to3
@@ -45,15 +39,31 @@ BuildRequires: python3-nose
 %endif
 %endif # if with_python3
 
-%description
-Beaker is a caching library that includes Session and Cache objects built on
-Myghty's Container API used in MyghtyUtils. WSGI middleware is also included to
+%global _description\
+Beaker is a caching library that includes Session and Cache objects built on\
+Myghty's Container API used in MyghtyUtils. WSGI middleware is also included to\
 manage Session objects and signed cookies.
 
+%description %_description
+
+%package -n python2-beaker
+Summary: %summary
+Requires: python-paste
+%if 0%{?fedora}
+Requires: pycryptopp
+%else
+Requires: python-crypto
+%endif
+%{?python_provide:%python_provide python2-beaker}
+# Remove before F30
+Provides: %{name}%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}%{?_isa} < %{version}-%{release}
+
+%description -n python2-beaker %_description
+
 %if 0%{?with_python3}
 %package -n python3-beaker
-Summary: WSGI middleware layer to provide sessions
-Group: Development/Languages
+Summary: %summary
 # Paste is not python3 compatible at the moment
 #Requires: python3-paste
 # Without one of these there's no aes implementation which means there's no way to
@@ -66,11 +76,9 @@ Group: Development/Languages
 #%else
 #Requires: python3-crypto
 #%endif
+%{?python_provide:%python_provide python3-beaker}
 
-%description -n python3-beaker
-Beaker is a caching library that includes Session and Cache objects built on
-Myghty's Container API used in MyghtyUtils. WSGI middleware is also included to
-manage Session objects and signed cookies.
+%description -n python3-beaker %_description
 %endif # with_python3
 
 
@@ -120,7 +128,7 @@ PYTHONPATH=$(pwd) nosetests
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -n python2-beaker
 %defattr(-,root,root,-)
 %doc LICENSE CHANGELOG
 %{python_sitelib}/beaker/
@@ -135,6 +143,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 09 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+- Python 2 binary package renamed to python2-
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild