diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 0e2e399e79..e2a39e7d10 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,16 +1,18 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=1
+revision=2
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline
  --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
- $(vopt_if python --with-python=/usr/bin/python3)"
-hostmakedepends="texinfo perl $(vopt_if python python3-devel)"
+ $(vopt_if python --with-python=/usr/bin/python3)
+ $(vopt_with debuginfod)"
+hostmakedepends="texinfo perl pkg-config $(vopt_if python python3-devel)"
 makedepends="ncurses-devel zlib-devel readline-devel expat-devel
- $(vopt_if python 'python3-devel gettext-libs')"
+ $(vopt_if python 'python3-devel gettext-libs')
+ $(vopt_if debuginfod elfutils-devel)"
 short_desc="GNU Debugger"
 maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
@@ -28,10 +30,11 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python"
+build_options="gdbserver static python debuginfod"
 desc_option_gdbserver="Enable support for building GDB server"
+desc_option_debuginfod="Enable support for libdebuginfod"
 # Enable gdbserver if !static.
-build_options_default="gdbserver python"
+build_options_default="gdbserver python debuginfod"
 # Both options cannot be enabled at the same time
 vopt_conflict gdbserver static