diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec
index 927f010..5e4e9ba 100644
--- a/epel-rpm-macros.spec
+++ b/epel-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           epel-rpm-macros
 Version:        8
-Release:        34
+Release:        35
 Summary:        Extra Packages for Enterprise Linux RPM macros
 
 License:        GPLv2
@@ -22,6 +22,7 @@ Source24:       sysusers.generate-pre.sh
 
 # misc macros
 Source150:      macros.build-constraints
+Source151:      https://src.fedoraproject.org/rpms/redhat-rpm-config/raw/rawhide/f/macros.shell-completions
 
 BuildArch:      noarch
 Requires:       redhat-release >= %{version}
@@ -92,7 +93,8 @@ install -Dpm 0755 %{SOURCE24} \
 # misc macros
 install -Dpm 644 %{SOURCE150} \
     %{buildroot}%{_rpmmacrodir}/macros.build-constraints
-
+install -Dpm 644 %{SOURCE151} \
+    %{buildroot}%{_rpmmacrodir}/macros.shell-completions
 
 %files
 %license GPL
@@ -102,6 +104,7 @@ install -Dpm 644 %{SOURCE150} \
 
 # misc macros
 %{_rpmmacrodir}/macros.build-constraints
+%{_rpmmacrodir}/macros.shell-completions
 
 %files systemd
 # sysusers
@@ -112,6 +115,9 @@ install -Dpm 644 %{SOURCE150} \
 
 
 %changelog
+* Tue Nov 22 2022 Todd Zullinger <tmz@pobox.com> - 8-35
+- Backport macros.shell-completions from Fedora
+
 * Tue Nov 08 2022 Maxwell G <gotmax@e.email> - 8-34
 - Set %%__python3 to /usr/bin/python3.6 by default
 
diff --git a/macros.epel-rpm-macros b/macros.epel-rpm-macros
index d229bc6..49b41f4 100644
--- a/macros.epel-rpm-macros
+++ b/macros.epel-rpm-macros
@@ -8,7 +8,10 @@
 %_monogacdir %{_monodir}/gac
 
 # Bash completions; not in bash to not intefere with install ordering
-%bash_completion_dir %{_datadir}/bash-completion/completions/
+#
+# NOTE: This macro is deprecated; point to the preferred macro from
+# macros.shell-completions
+%bash_completion_dir %{bash_completions_dir}
 
 # Use the non-underscored Python macros to refer to Python in spec, etc.
 %python2 %__python2
diff --git a/macros.shell-completions b/macros.shell-completions
new file mode 100644
index 0000000..8e505d7
--- /dev/null
+++ b/macros.shell-completions
@@ -0,0 +1,3 @@
+%bash_completions_dir   %{_datadir}/bash-completion/completions
+%zsh_completions_dir    %{_datadir}/zsh/site-functions
+%fish_completions_dir   %{_datadir}/fish/vendor_completions.d