diff --git a/config-do-not-define-DEBUGINFOD_URLS-environment-var.patch b/config-do-not-define-DEBUGINFOD_URLS-environment-var.patch
new file mode 100644
index 0000000..29abbcb
--- /dev/null
+++ b/config-do-not-define-DEBUGINFOD_URLS-environment-var.patch
@@ -0,0 +1,55 @@
+From 911ac29b9eed3c66bba60eda6af8e5de62607e5c Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Wed, 4 Nov 2020 08:00:00 +0000
+Subject: [PATCH] config: do not define DEBUGINFOD_URLS environment variable
+ unnecessarily
+
+Before this change, when elfutils was configured without
+--enable-debuginfod-urls, the installed profile.d/debuginfod.sh and
+profile.d/debuginfod.csh scripts used to define the DEBUGINFOD_URLS
+environment variable as an non-empty string containing spaces, making
+all libdebuginfod users do extra work.
+
+Change these scripts to avoid defining the DEBUGINFOD_URLS environment
+variable unless configured using --enable-debuginfod-urls.
+
+Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
+---
+ config/ChangeLog      |  5 +++++
+ config/profile.csh.in | 13 +++++++++++--
+ config/profile.sh.in  |  7 ++++---
+ 3 files changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/config/profile.csh.in b/config/profile.csh.in
+index 4f25896d..0a2d6d16 100644
+--- a/config/profile.csh.in
++++ b/config/profile.csh.in
+@@ -1,2 +1,11 @@
+-
+-setenv DEBUGINFOD_URLS "$DEBUGINFOD_URLS @DEBUGINFOD_URLS@"
++if ("@DEBUGINFOD_URLS@" != "") then
++	if ($?DEBUGINFOD_URLS) then
++		if ($%DEBUGINFOD_URLS) then
++			setenv DEBUGINFOD_URLS "$DEBUGINFOD_URLS @DEBUGINFOD_URLS@"
++		else
++			setenv DEBUGINFOD_URLS "@DEBUGINFOD_URLS@"
++		endif
++	else
++		setenv DEBUGINFOD_URLS "@DEBUGINFOD_URLS@"
++	endif
++endif
+diff --git a/config/profile.sh.in b/config/profile.sh.in
+index 8a022489..aa228a0d 100644
+--- a/config/profile.sh.in
++++ b/config/profile.sh.in
+@@ -1,3 +1,4 @@
+-
+-DEBUGINFOD_URLS="$DEBUGINFOD_URLS @DEBUGINFOD_URLS@"
+-export DEBUGINFOD_URLS
++if [ -n "@DEBUGINFOD_URLS@" ]; then
++	DEBUGINFOD_URLS="${DEBUGINFOD_URLS-}${DEBUGINFOD_URLS:+ }@DEBUGINFOD_URLS@"
++	export DEBUGINFOD_URLS
++fi
+-- 
+2.29.2
+
diff --git a/elfutils-debuginfod.changes b/elfutils-debuginfod.changes
index c9496fb..353961b 100644
--- a/elfutils-debuginfod.changes
+++ b/elfutils-debuginfod.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan  4 12:01:02 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Add upstream config-do-not-define-DEBUGINFOD_URLS-environment-var.patch
+  in order to fix boo#1180306.
+
 -------------------------------------------------------------------
 Thu Dec 10 12:21:29 UTC 2020 - Martin Liška <mliska@suse.cz>
 
diff --git a/elfutils-debuginfod.spec b/elfutils-debuginfod.spec
index b5bf1d3..f0b27c2 100644
--- a/elfutils-debuginfod.spec
+++ b/elfutils-debuginfod.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package elfutils-debuginfod
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -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:         config-do-not-define-DEBUGINFOD_URLS-environment-var.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
diff --git a/elfutils.spec b/elfutils.spec
index 06baa7c..ef61a76 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package elfutils
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed