diff --git a/elfutils.spec b/elfutils.spec
index 11e7613..64b964a 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -1,6 +1,6 @@
 Name: elfutils
 Version: 0.187
-%global baserelease 7
+%global baserelease 8
 Release: %{baserelease}%{?dist}
 URL: http://elfutils.org/
 %global source_url ftp://sourceware.org/pub/elfutils/%{version}/
@@ -68,8 +68,6 @@ BuildRequires: gettext-devel
 %global with_sysusers		1
 %endif
 
-%bcond with_debuginfod_url 1
-
 # Patches
 
 # For s390x... FDO package notes are bogus.
@@ -273,8 +271,11 @@ RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wformat"
 
 
 trap 'cat config.log' EXIT
-%if %{with with_debuginfod_url}
-%configure CFLAGS="$RPM_OPT_FLAGS" --enable-debuginfod-urls=https://debuginfod.fedoraproject.org/
+# dist_debuginfod_url is defined in macros.dist. Fedora and CentOS have
+# URLs pointing to their respective servers.  RHEL and Amazon Linux do
+# not configure a default server.
+%if "%{?dist_debuginfod_url}"
+%configure CFLAGS="$RPM_OPT_FLAGS" --enable-debuginfod-urls=%{dist_debuginfod_url}
 %else
 %configure CFLAGS="$RPM_OPT_FLAGS"
 %endif
@@ -401,7 +402,7 @@ fi
 %{_mandir}/man1/debuginfod-find.1*
 %{_mandir}/man7/debuginfod*.7*
 %config(noreplace) %{_sysconfdir}/profile.d/*
-%if %{with with_debuginfod_url}
+%if "%{?dist_debuginfod_url}"
 %config(noreplace) %{_sysconfdir}/debuginfod/*
 %endif
 
@@ -442,6 +443,9 @@ exit 0
 %systemd_postun_with_restart debuginfod.service
 
 %changelog
+* Mon Aug 1 2022 Amit Shah <amitshah@fedoraproject.org> - 0.187-8
+- Auto-configure debuginfod_url based on macros.dist
+
 * Wed Jul 27 2022 Amit Shah <amitshah@fedoraproject.org> - 0.187-7
 - Allow building without default debuginfod URL