diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index a7170994265..5b16bb2fc11 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-02-12  Nick Clifton  <nickc@redhat.com>
 
 	* configure.ac (follow-debug-links): Add option to enable or
diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4
index 8eca8cf94c7..e6b490ac4c6 100644
--- a/binutils/aclocal.m4
+++ b/binutils/aclocal.m4
@@ -1201,6 +1201,7 @@ m4_include([../config/lib-link.m4])
 m4_include([../config/lib-prefix.m4])
 m4_include([../config/nls.m4])
 m4_include([../config/override.m4])
+m4_include([../config/pkg.m4])
 m4_include([../config/plugins.m4])
 m4_include([../config/po.m4])
 m4_include([../config/progtest.m4])
diff --git a/config/ChangeLog b/config/ChangeLog
index 847fc0656ff..95dcc85b42b 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* debuginfod.m4: Delete m4_include(../config/pkg.m4).
+
 2021-01-12  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutils/26792
@@ -2293,4 +2297,3 @@ Thu Jan 30 16:17:30 1992  Stu Grossman  (grossman at cygnus.com)
 Tue Dec 10 00:10:55 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
 
 	* ChangeLog: fresh changelog.
-
diff --git a/config/debuginfod.m4 b/config/debuginfod.m4
index f9eb0988e35..2c1bfbdb544 100644
--- a/config/debuginfod.m4
+++ b/config/debuginfod.m4
@@ -5,8 +5,6 @@ dnl Public License, this file may be distributed as part of a program
 dnl that contains a configuration script generated by Autoconf, under
 dnl the same distribution terms as the rest of that program.
 
-m4_include([../config/pkg.m4])
-
 AC_DEFUN([AC_DEBUGINFOD],
 [
 # Handle optional debuginfod support
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e79b9535f70..204bb40b2c9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4: Regenerate.
+
 2021-02-12  Tom de Vries  <tdevries@suse.de>
 
 	PR threads/26228
diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
index 110b416e615..cbea739c0e5 100644
--- a/gdb/aclocal.m4
+++ b/gdb/aclocal.m4
@@ -199,4 +199,5 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../config/pkg.m4])
 m4_include([acinclude.m4])