diff --git a/glibc.spec b/glibc.spec
index 89f0d3a..d89def9 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -152,7 +152,15 @@ end}
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 28%{?dist}
+
+# We'll use baserelease here for two reasons:
+# - It is known to rpmdev-bumpspec, so it will be properly handled for mass-
+#   rebuilds
+# - It allows using the Release number without the %%dist tag in the dependency
+#   generator to make the generated requires interchangeable between Rawhide
+#   and ELN (.elnYY < .fcXX).
+%global baserelease 29
+Release: %{baserelease}%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -1688,7 +1696,7 @@ sed -i -e '\,libmemusage.so,d' \
 mkdir -p %{glibc_sysroot}/%{_rpmconfigdir} %{glibc_sysroot}/%{_fileattrsdir}
 sed < %{SOURCE3} \
     -e s/@VERSION@/%{version}/ \
-    -e s/@RELEASE@/%{release}/ \
+    -e s/@RELEASE@/%{baserelease}/ \
     -e s/@SYMVER@/%{glibc_autorequires_symver}/ \
     > %{glibc_sysroot}/%{_rpmconfigdir}/glibc.req
 cp %{SOURCE4} %{glibc_sysroot}/%{_fileattrsdir}/glibc.attr
@@ -2178,6 +2186,9 @@ update_gconv_modules_cache ()
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Fri Jul  8 2022 Stephen Gallagher <sgallagh@redhat.com> - 2.35.9000-29
+- Modify glibc autorequires to exclude %%dist
+
 * Tue Jul  5 2022 Florian Weimer <fweimer@redhat.com> - 2.35.9000-28
 - ppc64le: Increase Clang compatibility of float128 redirects (#2100546)