diff --git a/elfutils.spec b/elfutils.spec
index cf7b1c8..fc60cf5 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -1,6 +1,6 @@
 Name: elfutils
 Version: 0.186
-%global baserelease 1
+%global baserelease 2
 Release: %{baserelease}%{?dist}
 URL: http://elfutils.org/
 %global source_url ftp://sourceware.org/pub/elfutils/%{version}/
@@ -253,7 +253,12 @@ RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wformat"
 
 
 trap 'cat config.log' EXIT
+
+%if 0%{?centos} >= 8
+%configure CFLAGS="$RPM_OPT_FLAGS -fexceptions" --enable-debuginfod-urls=https://debuginfod.centos.org/
+%else
 %configure CFLAGS="$RPM_OPT_FLAGS -fexceptions"
+%endif
 trap '' EXIT
 %make_build
 
@@ -264,9 +269,11 @@ chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib*.so*
 # We don't want the static libraries
 rm ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib{elf,dw,asm}.a
 
+%if 0%{?centos} < 8
 # We don't have standard DEBUGINFOD_URLS yet.
 rm ${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d/debuginfod.sh
 rm ${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d/debuginfod.csh
+%endif
 
 %find_lang %{name}
 
@@ -376,6 +383,10 @@ fi
 %{_bindir}/debuginfod-find
 %{_mandir}/man1/debuginfod-find.1*
 %{_mandir}/man7/debuginfod*.7*
+%if 0%{?centos} >= 8
+%{_sysconfdir}/profile.d/debuginfod.*
+%{_sysconfdir}/debuginfod/*.urls
+%endif
 
 %files debuginfod-client-devel
 %{_libdir}/pkgconfig/libdebuginfod.pc
@@ -407,6 +418,9 @@ exit 0
 %systemd_postun_with_restart debuginfod.service
 
 %changelog
+* Thu Feb 10 2022 Frank Ch. Eigler <fche@redhat.com> - 0.186-2
+- rhbz2053226: enable debuginfod.centos.org support by default
+
 * Tue Nov 23 2021 Mark Wielaard <mjw@redhat.com> - 0.186-1
 - Upgrade to upstream 0.186
   - debuginfod-client: Default $DEBUGINFOD_URLS is computed from