diff --git a/macros.python-srpm b/macros.python-srpm
new file mode 100644
index 0000000..87ce887
--- /dev/null
+++ b/macros.python-srpm
@@ -0,0 +1,8 @@
+# python3_pkgversion specifies the version of Python 3 in the distro.  It can be
+# a specific version (e.g. 34 in Fedora EPEL7)
+%python3_pkgversion 3
+
+# Set to /bin/true to avoid %ifdefs and %{? in specfiles
+%__python3_other /bin/true
+%py3_other_build /bin/true
+%py3_other_install /bin/true
diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec
index a82e27a..577eb9f 100644
--- a/python-rpm-macros.spec
+++ b/python-rpm-macros.spec
@@ -1,11 +1,11 @@
 Name:           python-rpm-macros
 Version:        3
-Release:        6%{?dist}
+Release:        5%{?dist}
 Summary:        The unversioned Python RPM macros
 
 License:        MIT
 Source0:        macros.python
-Source1:        macros.0python-srpm
+Source1:        macros.python-srpm
 Source2:        macros.python2
 Source3:        macros.python3
 
@@ -57,7 +57,7 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \
 %{_rpmconfigdir}/macros.d/macros.python
 
 %files -n python-srpm-macros
-%{_rpmconfigdir}/macros.d/macros.0python-srpm
+%{_rpmconfigdir}/macros.d/macros.python-srpm
 
 %files -n python2-rpm-macros
 %{_rpmconfigdir}/macros.d/macros.python2
@@ -67,9 +67,6 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \
 
 
 %changelog
-* Thu Jan 14 2016 Orion Poplawski <orion@cora.nwra.com> 3-6
-- Move srpm macros to macros.0python-srpm to be defined before other macros
-
 * Thu Jan 14 2016 Orion Poplawski <orion@cora.nwra.com> 3-5
 - Handle noarch python sub-packages (bug #1290900)