diff --git a/disable-run-readelf-self-test.patch b/disable-run-readelf-self-test.patch
new file mode 100644
index 0000000..ba6f41a
--- /dev/null
+++ b/disable-run-readelf-self-test.patch
@@ -0,0 +1,58 @@
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index c145720..7a1e05a 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -115,7 +115,7 @@ TESTS = run-arextract.sh run-arsymtest.sh run-ar.sh newfile test-nlist \
+ 	run-addrscopes.sh run-strings-test.sh run-funcscopes.sh \
+ 	run-find-prologues.sh run-allregs.sh run-addrcfi.sh \
+ 	run-dwarfcfi.sh run-nm-syms.sh \
+-	run-nm-self.sh run-readelf-self.sh run-readelf-info-plus.sh \
++	run-nm-self.sh run-readelf-info-plus.sh \
+ 	run-readelf-compressed.sh \
+ 	run-readelf-const-values.sh \
+ 	run-varlocs-self.sh run-exprlocs-self.sh \
+@@ -250,7 +250,7 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh run-ar.sh \
+ 	     run-ranlib-test3.sh run-ranlib-test4.sh \
+ 	     run-addrscopes.sh run-strings-test.sh run-funcscopes.sh \
+ 	     run-nm-syms.sh testfilesyms32.bz2 testfilesyms64.bz2 \
+-	     run-nm-self.sh run-readelf-self.sh run-readelf-info-plus.sh \
++	     run-nm-self.sh run-readelf-info-plus.sh \
+ 	     run-readelf-compressed.sh \
+ 	     run-readelf-compressed-zstd.sh \
+ 	     run-readelf-const-values.sh testfile-const-values.debug.bz2 \
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 7fc04cc..2ade94f 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -154,7 +154,7 @@ TESTS = run-arextract.sh run-arsymtest.sh run-ar.sh newfile$(EXEEXT) \
+ 	run-addrscopes.sh run-strings-test.sh run-funcscopes.sh \
+ 	run-find-prologues.sh run-allregs.sh run-addrcfi.sh \
+ 	run-dwarfcfi.sh run-nm-syms.sh run-nm-self.sh \
+-	run-readelf-self.sh run-readelf-info-plus.sh \
++	run-readelf-info-plus.sh \
+ 	run-readelf-compressed.sh run-readelf-const-values.sh \
+ 	run-varlocs-self.sh run-exprlocs-self.sh run-readelf-test1.sh \
+ 	run-readelf-test2.sh run-readelf-test3.sh run-readelf-test4.sh \
+@@ -1295,7 +1295,7 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh run-ar.sh \
+ 	     run-ranlib-test3.sh run-ranlib-test4.sh \
+ 	     run-addrscopes.sh run-strings-test.sh run-funcscopes.sh \
+ 	     run-nm-syms.sh testfilesyms32.bz2 testfilesyms64.bz2 \
+-	     run-nm-self.sh run-readelf-self.sh run-readelf-info-plus.sh \
++	     run-nm-self.sh run-readelf-info-plus.sh \
+ 	     run-readelf-compressed.sh \
+ 	     run-readelf-compressed-zstd.sh \
+ 	     run-readelf-const-values.sh testfile-const-values.debug.bz2 \
+@@ -3061,13 +3061,6 @@ run-nm-self.sh.log: run-nm-self.sh
+ 	--log-file $$b.log --trs-file $$b.trs \
+ 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-run-readelf-self.sh.log: run-readelf-self.sh
+-	@p='run-readelf-self.sh'; \
+-	b='run-readelf-self.sh'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ run-readelf-info-plus.sh.log: run-readelf-info-plus.sh
+ 	@p='run-readelf-info-plus.sh'; \
+ 	b='run-readelf-info-plus.sh'; \
diff --git a/elfutils-debuginfod.changes b/elfutils-debuginfod.changes
index 844eb22..4648b0e 100644
--- a/elfutils-debuginfod.changes
+++ b/elfutils-debuginfod.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 16 15:40:31 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Enable https://debuginfod.opensuse.org/ debuginfod server
+  by default now.
+- Add disable-run-readelf-self-test.patch in order to disable
+  a failing test-case with GCC 11 (PR27367).
+
 -------------------------------------------------------------------
 Mon Feb  8 10:59:08 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/elfutils-debuginfod.spec b/elfutils-debuginfod.spec
index e3e2309..8b387dc 100644
--- a/elfutils-debuginfod.spec
+++ b/elfutils-debuginfod.spec
@@ -28,6 +28,7 @@ Source:         https://fedorahosted.org/releases/e/l/elfutils/%{version}/elfuti
 Source1:        https://fedorahosted.org/releases/e/l/elfutils/%{version}/elfutils-%{version}.tar.bz2.sig
 Source2:        elfutils.changes
 Source3:        elfutils.keyring
+Patch0:         disable-run-readelf-self-test.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -113,7 +114,8 @@ CFLAGS+=" -fPIC"
 autoreconf -fi
 # some patches create new test scripts, which are created 644 by default
 chmod a+x tests/run*.sh
-%configure --program-prefix=eu-
+%configure --enable-debuginfod-urls=https://debuginfod.opensuse.org/ \
+  --program-prefix=eu-
 %make_build
 
 %install
diff --git a/elfutils.changes b/elfutils.changes
index f0a1d77..d4577b6 100644
--- a/elfutils.changes
+++ b/elfutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 17 07:43:33 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Add disable-run-readelf-self-test.patch in order to disable
+  a failing test-case with GCC 11 (PR27367).
+
 -------------------------------------------------------------------
 Mon Feb  8 10:59:08 UTC 2021 - Martin Liška <mliska@suse.cz>
 
diff --git a/elfutils.spec b/elfutils.spec
index 48c1b9d..8558328 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -31,6 +31,7 @@ Source3:        %{name}.changes
 Source4:        https://fedorahosted.org/releases/e/l/%{name}/%{version}/%{name}-%{version}.tar.bz2.sig
 Source5:        %{name}.keyring
 Source6:        elfutils-rpmlintrc
+Patch0:         disable-run-readelf-self-test.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison