diff --git a/pyflakes.spec b/pyflakes.spec
index 85b84b9894..d57af349f3 100644
--- a/pyflakes.spec
+++ b/pyflakes.spec
@@ -6,7 +6,7 @@
 
 Name:           pyflakes
 Version:        1.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple program which checks Python source files for errors
 
 License:        MIT
@@ -19,9 +19,6 @@ Patch0:         %{name}-1.1.0-python3-man.patch
 BuildArch:      noarch
 BuildRequires:  python2-devel >= 2.5
 BuildRequires:  python-setuptools
-Requires:       python-setuptools
-Provides:       python2-pyflakes = %{version}-%{release}
-%{?python_provide:%python_provide python2-%{name}}
 
 %global desc Pyflakes is similar to PyChecker in scope, but differs in that it does\
 not execute the modules to check them. This is both safer and faster,\
@@ -29,9 +26,21 @@ although it does not perform as many checks. Unlike PyLint, Pyflakes\
 checks only for logical errors in programs; it does not perform any\
 check on style.
 
-%description
+%global _description\
 %{desc}
 
+%description %_description
+
+%package -n python2-pyflakes
+Summary: %summary
+Requires:       python-setuptools
+%{?python_provide:%python_provide python2-pyflakes}
+# Remove before F30
+Provides: pyflakes = %{version}-%{release}
+Obsoletes: pyflakes < %{version}-%{release}
+
+%description -n python2-pyflakes %_description
+
 %package -n python%{python3_pkgversion}-%{name}
 Summary:        %{summary}
 BuildRequires:  python%{python3_pkgversion}-devel
@@ -75,7 +84,7 @@ ln -s pyflakes-%{defaultpython}.1 %{buildroot}%{_mandir}/man1/pyflakes.1
 %{__python2} -Wall setup.py test
 %{__python3} -Wall setup.py test
 
-%files
+%files -n python2-pyflakes
 %license LICENSE
 %doc AUTHORS NEWS.txt README.rst
 %{_bindir}/pyflakes-%{python2_version}
@@ -106,6 +115,10 @@ ln -s pyflakes-%{defaultpython}.1 %{buildroot}%{_mandir}/man1/pyflakes.1
 %endif
 
 %changelog
+* Sun Dec 17 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.6.0-2
+- Python 2 binary package renamed to python2-pyflakes
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
 * Thu Aug  3 2017 Ville Skyttä <ville.skytta@iki.fi> - 1.6.0-1
 - Update to 1.6.0