diff --git a/python-pip.spec b/python-pip.spec
index 137c007..06cb298 100644
--- a/python-pip.spec
+++ b/python-pip.spec
@@ -1,6 +1,6 @@
-%if (! 0%{?rhel}) || 0%{?rhel} > 7
+%if (! 0%{?rhel}) || 0%{?rhel} > 5
 %global with_python3 1
-%global build_wheel 1
+%global build_wheel 0
 %global with_tests 0
 %endif
 %if 0%{?rhel} && 0%{?rhel} < 6
@@ -22,7 +22,7 @@
 
 Name:           python-%{srcname}
 Version:        7.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A tool for installing and managing Python packages
 
 Group:          Development/Libraries
@@ -66,28 +66,28 @@ easy_installable should be pip-installable as well.
 
 
 %if 0%{?with_python3}
-%package -n python3-pip
+%package -n python%{python3_pkgversion}-pip
 Summary:        A tool for installing and managing Python3 packages
 Group:          Development/Libraries
 
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  bash-completion
 %if 0%{?with_tests}
-BuildRequires:  python3-mock
-BuildRequires:  python3-pytest
-BuildRequires:  python3-pretend
-BuildRequires:  python3-freezegun
-BuildRequires:  python3-scripttest
-BuildRequires:  python3-virtualenv
+BuildRequires:  python%{python3_pkgversion}-mock
+BuildRequires:  python%{python3_pkgversion}-pytest
+BuildRequires:  python%{python3_pkgversion}-pretend
+BuildRequires:  python%{python3_pkgversion}-freezegun
+BuildRequires:  python%{python3_pkgversion}-scripttest
+BuildRequires:  python%{python3_pkgversion}-virtualenv
 %endif
 %if 0%{?build_wheel}
-BuildRequires:  python3-pip
-BuildRequires:  python3-wheel
+BuildRequires:  python%{python3_pkgversion}-pip
+BuildRequires:  python%{python3_pkgversion}-wheel
 %endif
-Requires:  python3-setuptools
+Requires:  python%{python3_pkgversion}-setuptools
 
-%description -n python3-pip
+%description -n python%{python3_pkgversion}-pip
 Pip is a replacement for `easy_install
 <http://peak.telecommunity.com/DevCenter/EasyInstall>`_.  It uses mostly the
 same techniques for finding packages, so packages that were made
@@ -218,7 +218,7 @@ popd
 %endif
 
 %if 0%{?with_python3}
-%files -n python3-pip
+%files -n python%{python3_pkgversion}-pip
 %defattr(-,root,root,-)
 %license LICENSE.txt
 %doc README.rst docs
@@ -232,6 +232,9 @@ popd
 %endif # with_python3
 
 %changelog
+* Mon Nov 11 2019 Steve Traylen <steve.traylen@cern.ch> - 7.1.0-2
+- Create a python3(4) package.
+
 * Wed Jul 01 2015 Slavek Kabrda <bkabrda@redhat.com> - 7.1.0-1
 - Update to 7.1.0