diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec
index b179a20..2681be6 100644
--- a/SPECS/rocky-release.spec
+++ b/SPECS/rocky-release.spec
@@ -162,12 +162,13 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/rpm
 cat > %{buildroot}%{_sysconfdir}/rpm/macros.dist << EOF
 # dist macros.
 
+%%__bootstrap ~bootstrap
 %%rocky_ver %{major}
 %%rocky %{major}
 %%centos_ver %{major}
 %%centos %{major}
 %%rhel %{major}
-%%dist .el%{major}
+%%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.el%{major}%%{?with_bootstrap:%{__bootstrap}}
 %%el%{major} 1
 EOF
 
@@ -235,6 +236,9 @@ install -p -m 0644 %{SOURCE1226} %{buildroot}%{_sysconfdir}/yum.repos.d/
 %{_sysconfdir}/pki/rpm-gpg/
 
 %changelog
+* Mon Feb 14 2022 Louis Abel <label@rockylinux.org> - 8.5-4
+- Add bootstrap to macros to match EL9
+
 * Tue Dec 21 2021 Louis Abel <label@rockylinux.org> - 8.5-3
 - Add countme=1 to base repositories