diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec
index 71b3177..aeaf408 100644
--- a/epel-rpm-macros.spec
+++ b/epel-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           epel-rpm-macros
 Version:        8
-Release:        29
+Release:        30
 Summary:        Extra Packages for Enterprise Linux RPM macros
 
 License:        GPLv2
@@ -36,8 +36,10 @@ Requires:       python-rpm-macros
 Requires:       python2-rpm-macros
 # Make sure EPEL8's Python 3 packages use /usr/bin/python3.6 or python3.8
 #   instead of /usr/libexec/platform-python
-Requires:       (python-modular-rpm-macros if python3-devel)
-Suggests:       python36-rpm-macros
+Requires:       (python-modular-rpm-macros if (python36-devel or python38-devel or python39-devel))
+Suggests:       (python36-rpm-macros if python36-devel)
+Suggests:       (python38-rpm-macros if python38-devel)
+Suggests:       (python39-rpm-macros if python39-devel)
 #systemd additional macros https://pagure.io/epel/issue/77
 Requires:       (epel-rpm-macros-systemd if systemd-rpm-macros)
 Requires:       ansible-srpm-macros
@@ -103,6 +105,10 @@ install -Dpm 644 %{SOURCE150} \
 
 
 %changelog
+* Tue May 24 2022 Maxwell G <gotmax@e.email> - 8-30
+- Pull in appropriate python3X-rpm-macros package for non-default Python
+  versions
+
 * Tue May 17 2022 Maxwell G <gotmax@e.email> - 8-29
 - Add `Requires: ansible-srpm-macros`
 - Backport @churchyard's packaging nitpicks from epel9