diff --git a/python-setuptools.spec b/python-setuptools.spec
index 3c40ad3..01fe960 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -21,15 +21,14 @@
 %bcond_without main_python
 
 %if %{without bootstrap}
-%global python_wheelname %{srcname}-%{version}-py3-none-any.whl
+%global python_wheel_name %{srcname}-%{version}-py3-none-any.whl
 %global python3_record %{python3_sitelib}/%{srcname}-%{version}.dist-info/RECORD
 %endif
-%global python_wheeldir %{_datadir}/python-wheels
 
 Name:           python-setuptools
 # When updating, update the bundled libraries versions bellow!
 Version:        53.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Easily build and distribute Python packages
 # setuptools is MIT
 # appdirs is MIT
@@ -111,11 +110,13 @@ This package also contains the runtime components of setuptools, necessary to
 execute the software that requires pkg_resources.
 
 %if %{without bootstrap}
-%package wheel
+%package -n     %{python_wheel_pkg_prefix}-%{srcname}-wheel
 Summary:        The setuptools wheel
 %{bundled}
+Provides:       %{name}-wheel = %{version}-%{release}
+Obsoletes:      %{name}-wheel < %{version}-%{release}
 
-%description wheel
+%description -n %{python_wheel_pkg_prefix}-%{srcname}-wheel
 A Python wheel of setuptools to use with venv.
 %endif
 
@@ -149,7 +150,7 @@ sed -i pytest.ini -e 's/ --flake8//' \
 
 %install
 %if %{without bootstrap}
-%py3_install_wheel %{python_wheelname}
+%py3_install_wheel %{python_wheel_name}
 %else
 %py3_install
 %endif
@@ -167,8 +168,8 @@ find %{buildroot}%{python3_sitelib} -name '*.exe' | xargs rm -f
 rm -r docs/{conf.py,_*}
 
 %if %{without bootstrap}
-mkdir -p %{buildroot}%{python_wheeldir}
-install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
+mkdir -p %{buildroot}%{python_wheel_dir}
+install -p dist/%{python_wheel_name} -t %{buildroot}%{python_wheel_dir}
 %endif
 
 %if %{with tests}
@@ -179,7 +180,7 @@ cat pkg_resources/_vendor/vendored.txt setuptools/_vendor/vendored.txt > allvend
 
 # Regression test, the wheel should not be larger than 600 KiB
 # https://bugzilla.redhat.com/show_bug.cgi?id=1914481#c3
-test $(du dist/%{python_wheelname} | cut -f1) -lt 600
+test $(du dist/%{python_wheel_name} | cut -f1) -lt 600
 
 # Upstream tests
 # --ignore=pavement.py:
@@ -197,15 +198,20 @@ PYTHONPATH=$(pwd) %pytest --ignore=pavement.py
 %{python3_sitelib}/distutils-precedence.pth
 
 %if %{without bootstrap}
-%files wheel
+%files -n %{python_wheel_pkg_prefix}-%{srcname}-wheel
 %license LICENSE
 # we own the dir for simplicity
-%dir %{python_wheeldir}/
-%{python_wheeldir}/%{python_wheelname}
+%dir %{python_wheel_dir}/
+%{python_wheel_dir}/%{python_wheel_name}
 %endif
 
 
 %changelog
+* Wed Sep 22 2021 Tomas Orsava <torsava@redhat.com> - 53.0.0-7
+- Make the python-setuptools-wheel subpackage versioned (python3-setuptools-wheel),
+  and move its contents to a versioned directory /usr/share/python3-wheels
+- Resolves: rhbz#1982668
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com>
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688