diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec
index da6e246..69b6534 100644
--- a/epel-rpm-macros.spec
+++ b/epel-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           epel-rpm-macros
 Version:        7
-Release:        16
+Release:        17
 Summary:        Extra Packages for Enterprise Linux RPM macros
 
 Group:          System Environment/Base
@@ -47,6 +47,9 @@ install -Dpm 644 %{SOURCE1} \
 
 
 %changelog
+* Fri Apr 20 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 7-17
+- Add %%_rpmmacrodir from Fedora.
+
 * Fri Apr 20 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 7-16
 - Add %%_metainfodir macro.
 
diff --git a/macros.epel-rpm-macros b/macros.epel-rpm-macros
index 9179f8a..870f91a 100644
--- a/macros.epel-rpm-macros
+++ b/macros.epel-rpm-macros
@@ -10,6 +10,9 @@
 # A directory for rpm macros
 %rpmmacrodir /usr/lib/rpm/macros.d
 
+# Upstream RPM has this in Fedora, obsoleting the one above.
+%_rpmmacrodir /usr/lib/rpm/macros.d
+
 # A directory for appdata metainfo.  The EPEL value differs from that of F28+.
 %_metainfodir %{_datadir}/appdata