diff --git a/binutils.spec b/binutils.spec
index f57b755..6b544f0 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -2,7 +2,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.34.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -20,6 +20,7 @@ URL: https://sourceware.org/binutils
 # --without testsuite    Do not run the testsuite.  Default is to run it.
 # --without gold         Disable building of the GOLD linker.
 # --with clang           To force building with the CLANG.
+# --without debuginfod   Disable support for debuginfod.
 
 #---Start of Configure Options-----------------------------------------------
 
@@ -73,6 +74,8 @@ URL: https://sourceware.org/binutils
 %bcond_without testsuite
 # Use clang as the build time compiler.  Default: gcc
 %bcond_with clang 
+# Default: support debuginfod.
+%bcond_without debuginfod
 
 
 %if %{with bootstrap}
@@ -236,9 +239,12 @@ Patch17: binutils-gold-warn-unsupported.patch
 Patch18: binutils-bad-plugin-err-message.patch
 
 Patch19: binutils-s390-build.patch
-
 Patch20: binutils-config.patch
 Patch21: binutils-warnings.patch
+
+# Purpose:  Fix problems exposed by compiling with gcc-10.
+# Lifetime: Should be fixed in 2.36.
+Patch22: binutils-gcc-10-fixes.patch
 #----------------------------------------------------------------------------
 
 Provides: bundled(libiberty)
@@ -299,6 +305,10 @@ Requires(post): coreutils
 %define _gnu %{nil}
 %endif
 
+%if %{with debuginfod}
+BuildRequires: elfutils-debuginfod-client-devel
+%endif
+
 #----------------------------------------------------------------------------
 
 %description
@@ -426,6 +436,10 @@ export CFLAGS="$RPM_OPT_FLAGS"
 
 CARGS=
 
+%if %{with debuginfod}
+CARGS="$CARGS --with-debuginfod"
+%endif
+
 case %{binutils_target} in i?86*|sparc*|ppc*|s390*|sh*|arm*|aarch64*|riscv*)
   CARGS="$CARGS --enable-64-bit-bfd"
   ;;
@@ -804,6 +818,9 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Fri Jul 24 2020 Nick Clifton  <nickc@redhat.com> - 2.34-10
+- Add support for debuginfod.  (#1860234)
+
 * Mon Jul 20 2020 Jeff Law  <law@redhat.com> - 2.34-9
 - Fix more configure tests compromised by LTO.