diff --git a/SOURCES/macros.python b/SOURCES/macros.python
index 5a94fcb..14baaf3 100644
--- a/SOURCES/macros.python
+++ b/SOURCES/macros.python
@@ -1,6 +1,29 @@
+# %%__python is defined in /usr/lib/rpm/macros to raise an error
+# so if you don't redefine it, you'll get the same error from %%python
+%python %__python
+
+%python_platform_triplet %(%{__python} -Esc "import sysconfig; print(sysconfig.get_config_var('MULTIARCH'))")
+%python_ext_suffix %(%{__python} -Esc "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")
+
 %py_setup setup.py
 %py_shbang_opts -s
 
+%py_shbang_opts_nodash %(opts=%{py_shbang_opts}; echo ${opts#-})
+%py_shebang_flags %(opts=%{py_shbang_opts}; echo ${opts#-})
+%py_shebang_fix %{expand:\\\
+  if [ -f /usr/bin/pathfix%{python_version}.py ]; then
+    pathfix=/usr/bin/pathfix%{python_version}.py
+  else
+    # unversioned pathfix.py provided by platform-python-devel
+    pathfix=/usr/bin/pathfix.py
+  fi
+  if [ -z "%{?py_shebang_flags}" ]; then
+    shebang_flags="-k"
+  else
+    shebang_flags="-ka%{py_shebang_flags}"
+  fi
+  $pathfix -pni %{__python} $shebang_flags}
+
 # Use the slashes after expand so that the command starts on the same line as
 # the macro
 %py_build() %{expand:\\\
diff --git a/SOURCES/macros.python-srpm b/SOURCES/macros.python-srpm
index 5dfee89..a064856 100644
--- a/SOURCES/macros.python-srpm
+++ b/SOURCES/macros.python-srpm
@@ -105,3 +105,17 @@
 \
     print(url .. first .. '/' .. src .. '/' .. src .. '-' .. ver .. '.' .. ext)
 }
+
+# Python packages in RHEL 8 should not provide unversioned python- names
+# so this macro here is just a compatibility layer and only provides the given name.
+%py_provides() %{lua:
+    local name = rpm.expand('%1')
+    if name == '%1' then
+        rpm.expand('%{error:%%py_provides requires at least 1 argument, the name to provide}')
+    end
+    local evr = rpm.expand('%2')
+    if evr == '%2' then
+        evr = rpm.expand('%{?epoch:%{epoch}:}%{version}-%{release}')
+    end
+    print('Provides: ' .. name .. ' = ' .. evr .. '\\n')
+}
diff --git a/SOURCES/macros.python3 b/SOURCES/macros.python3
index 886e312..a87e33c 100644
--- a/SOURCES/macros.python3
+++ b/SOURCES/macros.python3
@@ -1,12 +1,30 @@
 %__python3 /usr/libexec/platform-python
+%python3 %__python3
 %python3_sitelib %(%{__python3} -Ic "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
 %python3_sitearch %(%{__python3} -Ic "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
 %python3_version %(%{__python3} -Ic "import sys; sys.stdout.write(sys.version[:3])")
 %python3_version_nodots %(%{__python3} -Ic "import sys; sys.stdout.write(sys.version[:3].replace('.',''))")
 %python3_platform %(%{__python3} -Ic "import sysconfig; print(sysconfig.get_platform())")
+%python3_platform_triplet %(%{__python3} -Ic "import sysconfig; print(sysconfig.get_config_var('MULTIARCH'))")
+%python3_ext_suffix %(%{__python3} -Ic "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")
 %py3dir %{_builddir}/python3-%{name}-%{version}-%{release}
 
 %py3_shbang_opts -s
+%py3_shbang_opts_nodash %(opts=%{py3_shbang_opts}; echo ${opts#-})
+%py3_shebang_flags %(opts=%{py3_shbang_opts}; echo ${opts#-})
+%py3_shebang_fix %{expand:\\\
+  if [ -f /usr/bin/pathfix%{python3_version}.py ]; then
+    pathfix=/usr/bin/pathfix%{python3_version}.py
+  else
+    # unversioned pathfix.py provided by platform-python-devel
+    pathfix=/usr/bin/pathfix.py
+  fi
+  if [ -z "%{?py3_shebang_flags}" ]; then
+    shebang_flags="-k"
+  else
+    shebang_flags="-ka%{py3_shebang_flags}"
+  fi
+  $pathfix -pni %{__python3} $shebang_flags}
 
 # Use the slashes after expand so that the command starts on the same line as
 # the macro
@@ -41,3 +59,27 @@
 %py3_install_wheel() %{expand:\\\
   CFLAGS="%{optflags}" %{__python3} -m pip install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --no-deps
 }
+
+# This only supports Python 3.5+ and will never work with Python 2.
+# Hence, it has no Python version in the name.
+%pycached() %{lua:
+  path = rpm.expand("%{?*}")
+  if (string.sub(path, "-3") ~= ".py") then
+    rpm.expand("%{error:%%pycached can only be used with paths explicitly ending with .py}")
+  else
+    print(path)
+    pyminor = path:match("/python3.(%d+)/") or "*"
+    dirname = path:match("(.*/)")
+    modulename = path:match(".*/([^/]+).py")
+    print("\\n" .. dirname .. "__pycache__/" .. modulename .. ".cpython-3" .. pyminor .. "{,.opt-?}.pyc")
+  end
+}
+
+# This is intended for Python 3 only, hence also no Python version in the name.
+%__pytest /usr/bin/pytest-3
+%pytest %{expand:\\\
+  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
+  PATH="%{buildroot}%{_bindir}:$PATH"\\\
+  PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}"\\\
+  PYTHONDONTWRITEBYTECODE=1\\\
+  %__pytest}
diff --git a/SPECS/python-rpm-macros.spec b/SPECS/python-rpm-macros.spec
index 4bda903..8d53b71 100644
--- a/SPECS/python-rpm-macros.spec
+++ b/SPECS/python-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           python-rpm-macros
 Version:        3
-Release:        39%{?dist}
+Release:        41%{?dist}
 Summary:        The unversioned Python RPM macros
 
 License:        MIT
@@ -31,16 +31,18 @@ RPM macros for building Python source packages.
 
 %package -n python2-rpm-macros
 Summary:        RPM macros for building Python 2 packages
-# Would need to be different for each release - worth it?
-#Conflicts:      python2-devel < 2.7.11-3
+# For %%py_setup
+Requires:       python-rpm-macros = %{version}-%{release}
 
 %description -n python2-rpm-macros
 RPM macros for building Python 2 packages.
 
 %package -n python3-rpm-macros
 Summary:        RPM macros for building Python 3 packages
-# Would need to be different for each release - worth it?
-#Conflicts:      python3-devel < 3.5.1-3
+# Older versions have old pathfix.py without -ka options support
+Conflicts:      platform-python-devel < 3.6.8-35
+# For %%py_setup
+Requires:       python-rpm-macros = %{version}-%{release}
 
 %description -n python3-rpm-macros
 RPM macros for building Python 3 packages.
@@ -71,6 +73,14 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
 
 
 %changelog
+* Mon Feb 01 2021 Lumír Balhar <lbalhar@redhat.com> - 3-41
+- Fix dependencies between subpackages
+Resolves: rhbz#1892797
+
+* Thu Jan 14 2021 Lumír Balhar <lbalhar@redhat.com> - 3-40
+- New macros backported from Fedora/EPEL
+Resolves: rhbz#1892797
+
 * Tue Jun 16 2020 Charalampos Stratakis <cstratak@redhat.com> - 3-39
 - Strip tildes from %%version in %%pypi_source by default
 - Resolves: rhbz#1844902