diff --git a/setools.spec b/setools.spec
index 7bab4add5b..3a7c19f680 100644
--- a/setools.spec
+++ b/setools.spec
@@ -11,7 +11,7 @@
 
 Name:           setools
 Version:        4.1.1
-Release:        1%{?setools_pre_ver:.%{setools_pre_ver}}%{?dist}
+Release:        2%{?setools_pre_ver:.%{setools_pre_ver}}%{?dist}
 Summary:        Policy analysis tools for SELinux
 
 License:        GPLv2
@@ -34,7 +34,7 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 
 # BuildArch:      
-Requires:       %{name}-python3 = %{version}-%{release}
+Requires:       python3-%{name} = %{version}-%{release}
 
 %description
 SETools is a collection of graphical tools, command-line tools, and
@@ -76,20 +76,28 @@ This package includes the following console tools:
   seinfoflow   Perform information flow analyses.
 
 
-%package     python
+%package     -n python2-setools
 Summary:     Policy analysis tools for SELinux  
 Recommends:  libselinux-python
+%{?python_provide:%python_provide python2-setools}
+# Remove before F30
+Provides: %{name}-python%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-python < %{version}-%{release}
 
-%description python
+%description -n python2-setools
 SETools is a collection of graphical tools, command-line tools, and
 Python 2 modules designed to facilitate SELinux policy analysis.
 
-%package     python3
+%package     -n python3-setools
 Summary:     Policy analysis tools for SELinux  
 Obsoletes:   setools-libs < 4.0.0, setools-libs-tcl
 Recommends:  libselinux-python3
+%{?python_provide:%python_provide python2-setools}
+# Remove before F30
+Provides: %{name}-python3%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-python3 < %{version}-%{release}
 
-%description python3
+%description -n python3-setools
 SETools is a collection of graphical tools, command-line tools, and
 Python 3 modules designed to facilitate SELinux policy analysis.
 
@@ -156,7 +164,7 @@ popd
 %{_mandir}/man1/sedta*
 %{_mandir}/man1/seinfoflow*
 
-%files python
+%files -n python2-setools
 # %doc AUTHORS ChangeLog KNOWN-BUGS NEWS README
 %license COPYING COPYING.GPL COPYING.LGPL
 # For noarch packages: sitelib
@@ -164,7 +172,7 @@ popd
 # For arch-specific packages: sitearch
 %{python2_sitearch}/*
 
-%files python3
+%files -n python3-setools
 %license COPYING COPYING.GPL COPYING.LGPL
 # %doc AUTHORS ChangeLog KNOWN-BUGS NEWS README
 # For noarch packages: sitelib
@@ -177,6 +185,11 @@ popd
 %{_mandir}/man1/apol*
 
 %changelog
+* Thu Aug 10 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.1.1-2
+- Python 2 binary package renamed to python2-setools
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+- Python 3 binary package renamed to python3-setools
+
 * Mon Aug 07 2017 Petr Lautrbach <plautrba@redhat.com> - 4.1.1-1
 - New upstream release