diff --git a/dev-libs/elfutils/elfutils-0.193-r2.ebuild b/dev-libs/elfutils/elfutils-0.193-r2.ebuild
index b00932a94af66..e3510c2258061 100644
--- a/dev-libs/elfutils/elfutils-0.193-r2.ebuild
+++ b/dev-libs/elfutils/elfutils-0.193-r2.ebuild
@@ -97,6 +97,8 @@ src_configure() {
 	# bug 660738
 	filter-flags -fno-asynchronous-unwind-tables
 
+	use debuginfod && MULTILIB_WRAPPED_HEADERS+=( /usr/include/elfutils/debuginfod.h )
+
 	multilib-minimal_src_configure
 }
 
diff --git a/dev-libs/elfutils/elfutils-0.194-r1.ebuild b/dev-libs/elfutils/elfutils-0.194-r1.ebuild
index 4a59c0e8a473a..f1f53fe5501b9 100644
--- a/dev-libs/elfutils/elfutils-0.194-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.194-r1.ebuild
@@ -100,6 +100,8 @@ src_configure() {
 	# bug 660738
 	filter-flags -fno-asynchronous-unwind-tables
 
+	use debuginfod && MULTILIB_WRAPPED_HEADERS+=( /usr/include/elfutils/debuginfod.h )
+
 	multilib-minimal_src_configure
 }
 
diff --git a/dev-libs/elfutils/elfutils-9999.ebuild b/dev-libs/elfutils/elfutils-9999.ebuild
index 0b3a2cebcbc32..4abe9403c6229 100644
--- a/dev-libs/elfutils/elfutils-9999.ebuild
+++ b/dev-libs/elfutils/elfutils-9999.ebuild
@@ -99,6 +99,8 @@ src_configure() {
 	# bug 660738
 	filter-flags -fno-asynchronous-unwind-tables
 
+	use debuginfod && MULTILIB_WRAPPED_HEADERS+=( /usr/include/elfutils/debuginfod.h )
+
 	multilib-minimal_src_configure
 }