diff --git a/python-nwdiag.spec b/python-nwdiag.spec
index 04cfd6f40e..a2fd43f902 100644
--- a/python-nwdiag.spec
+++ b/python-nwdiag.spec
@@ -6,7 +6,7 @@
 
 Name:           python-%{srcname}
 Version:        1.0.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        nwdiag generates network-diagram images from text
 
 License:        ASL 2.0
@@ -33,23 +33,26 @@ BuildRequires:  python3-pillow
 BuildRequires:  python3-reportlab
 BuildRequires:  python3-setuptools
 
-Requires:       python-blockdiag
-
 
-%description
+%global _description\
 %(cat %{SOURCE1})
 
 
-%package -n python3-%{srcname}
-Summary:        %{summary}
-Requires:       python3-blockdiag
+%description %_description
 
+%package -n python2-%{srcname}
+Summary: %summary
+Requires:       python-blockdiag
+%{?python_provide:%python_provide python2-%{srcname}}
 
-%description -n python3-%{srcname}
-%(cat %{SOURCE1})
+%description -n python2-%{srcname} %_description
 
-This package installs the %{srcname} module for Python 3.
+%package -n python3-%{srcname}
+Summary:        %{summary}
+Requires:       python3-blockdiag
+%{?python_provide:%python_provide python3-%{srcname}}
 
+%description -n python3-%{srcname} %_description
 
 %prep
 %setup -qn %{srcname}-%{version}
@@ -62,7 +65,7 @@ rm -rf %{py3dir}
 cp -a . %{py3dir}
 
 find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
-find           -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
+find           -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|'
 
 
 %build
@@ -98,7 +101,7 @@ pushd %{py3dir}
 popd
 
 
-%files
+%files -n python2-%{srcname}
 %doc LICENSE
 %{_bindir}/*diag
 %{_mandir}/man1/*diag.1*
@@ -107,7 +110,7 @@ popd
 
 
 %files -n python3-%{srcname}
-%{_pkgdocdir}
+%doc LICENSE
 %{_bindir}/*-%{python3_version}
 %{_mandir}/man1/*-%{python3_version}.1*
 %{python3_sitelib}/__pycache__/*
@@ -116,6 +119,10 @@ popd
 
 
 %changelog
+* Thu Aug 10 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.0.4-6
+- Python 2 binary package renamed to python2-nwdiag
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild