diff --git a/pystache.spec b/pystache.spec
index b549548f74..a665c90260 100644
--- a/pystache.spec
+++ b/pystache.spec
@@ -1,7 +1,7 @@
 %global with_python3 1
 Name:           pystache
 Version:        0.5.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Mustache for Python
 
 License:        MIT
@@ -14,23 +14,36 @@ BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 # For the test
 BuildRequires:  python-simplejson
-Requires:       python-simplejson
 
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-# For the test
 BuildRequires:  python3-simplejson
-Requires:       python3-simplejson
 %endif # if with_python3
 
-%description
-Inspired by ctemplate and et, Mustache is a framework-agnostic way to render
-logic-free views.
+%global _description\
+Inspired by ctemplate and et, Mustache is a framework-agnostic way to render\
+logic-free views.\
+\
+As ctemplates says, "It emphasizes separating logic from presentation: it is\
+impossible to embed application logic in this template language."\
 
-As ctemplates says, "It emphasizes separating logic from presentation: it is
-impossible to embed application logic in this template language."
 
+%description %_description
+
+%package -n python2-pystache
+Summary: %summary
+Requires:       python-simplejson
+%if 0%{?with_python3}
+# For the test
+Requires:       python3-simplejson
+%endif # if with_python3
+%{?python_provide:%python_provide python2-pystache}
+# Remove before F30
+Provides: pystache = %{version}-%{release}
+Obsoletes: pystache < %{version}-%{release}
+
+%description -n python2-pystache %_description
 
 %if 0%{?with_python3}
 %package -n python3-pystache
@@ -85,7 +98,7 @@ popd
 #popd
 #%endif # with_python3 
 
-%files
+%files -n python2-pystache
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc PKG-INFO HISTORY.md README.md
@@ -106,6 +119,10 @@ popd
 %endif # with_python3
 
 %changelog
+* Sun Dec 17 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.5.4-4
+- Python 2 binary package renamed to python2-pystache
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild