diff --git a/debian/patches/Set-ACLOCAL_AMFLAGS-I-config.patch b/debian/patches/Set-ACLOCAL_AMFLAGS-I-config.patch
new file mode 100644
index 0000000..8e54211
--- /dev/null
+++ b/debian/patches/Set-ACLOCAL_AMFLAGS-I-config.patch
@@ -0,0 +1,106 @@
+From 8dfe38d2a453158fc0c51d870778ba9e113a3352 Mon Sep 17 00:00:00 2001
+From: Benjamin Drung <benjamin.drung@cloud.ionos.com>
+Date: Wed, 11 Nov 2020 14:41:27 +0100
+Subject: Set ACLOCAL_AMFLAGS = -I config
+
+To support running autoreconf with the usual `-f -i` parameters, set
+`ACLOCAL_AMFLAGS` to add `-I config`.
+
+Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
+---
+ Makefile.am            | 1 +
+ ibdiag/Makefile.am     | 1 +
+ ibdiag/src/Makefile.am | 2 ++
+ ibdm/Makefile.am       | 1 +
+ ibdm/src/Makefile.am   | 2 ++
+ ibis/Makefile.am       | 1 +
+ ibmgtsim/Makefile.am   | 1 +
+ 7 files changed, 9 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index cb13dbd..7a13001 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -43,6 +43,7 @@ DIST_SUBDIRS            = ibis ibdm ibdiag $(IBMGTSIMDIR)
+ # this will control the update of the files in order
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
+ 
++ACLOCAL_AMFLAGS = -I config
+ ACLOCAL			= aclocal -I $(ac_aux_dir)
+ 
+ EXTRA_DIST = ibutils.spec.in ibmgtsim
+diff --git a/ibdiag/Makefile.am b/ibdiag/Makefile.am
+index 7dffd57..7c5891d 100644
+--- a/ibdiag/Makefile.am
++++ b/ibdiag/Makefile.am
+@@ -38,4 +38,5 @@ SUBDIRS 		= src doc
+ # this will control the update of the files in order
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
+ 
++ACLOCAL_AMFLAGS = -I config
+ ACLOCAL			= aclocal -I $(ac_aux_dir)
+diff --git a/ibdiag/src/Makefile.am b/ibdiag/src/Makefile.am
+index f39b0ea..a01b8cd 100644
+--- a/ibdiag/src/Makefile.am
++++ b/ibdiag/src/Makefile.am
+@@ -30,6 +30,8 @@
+ # SOFTWARE.
+ #--
+ 
++ACLOCAL_AMFLAGS = -I config
++
+ bin_SCRIPTS = ibdiagnet ibdiagpath ibdiagui git_version.tcl
+ EXTRA_DIST = ibdebug_if.tcl ibdebug.tcl \
+ 	ibdiagnet.in ibdiagnet.pkg ibdiagnet.tcl \
+diff --git a/ibdm/Makefile.am b/ibdm/Makefile.am
+index 7a155b9..5936ba2 100644
+--- a/ibdm/Makefile.am
++++ b/ibdm/Makefile.am
+@@ -38,6 +38,7 @@ SUBDIRS 		= ibdm src Clusters ibnl doc scripts
+ # this will control the update of the files in order
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
+ 
++ACLOCAL_AMFLAGS = -I config
+ ACLOCAL			= aclocal -I $(ac_aux_dir)
+ 
+ # Support cleanup of swig wrappers
+diff --git a/ibdm/src/Makefile.am b/ibdm/src/Makefile.am
+index 5564542..d2a6c4e 100644
+--- a/ibdm/src/Makefile.am
++++ b/ibdm/src/Makefile.am
+@@ -34,6 +34,8 @@
+ 
+ # MAINTAINERCLEANFILES	= Makefile.in common.h stamp-common
+ 
++ACLOCAL_AMFLAGS = -I config
++
+ # INCLUDES		= -I$(top_builddir) -I$(top_srcdir) $(TCL_CPPFLAGS)
+ pkginclude_HEADERS = ibsysapi.h
+ 
+diff --git a/ibis/Makefile.am b/ibis/Makefile.am
+index 6a75322..be67b6d 100644
+--- a/ibis/Makefile.am
++++ b/ibis/Makefile.am
+@@ -38,6 +38,7 @@ SUBDIRS 		= src tests doc
+ # this will control the update of the files in order
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
+ 
++ACLOCAL_AMFLAGS = -I config
+ ACLOCAL			= aclocal -I $(ac_aux_dir)
+ 
+ # Support cleanup of swig wrappers
+diff --git a/ibmgtsim/Makefile.am b/ibmgtsim/Makefile.am
+index f528213..208293f 100644
+--- a/ibmgtsim/Makefile.am
++++ b/ibmgtsim/Makefile.am
+@@ -38,6 +38,7 @@ SUBDIRS 		= src utils tests doc
+ # this will control the update of the files in order
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
+ 
++ACLOCAL_AMFLAGS = -I config
+ ACLOCAL			= aclocal -I $(ac_aux_dir)
+ 
+ # Support cleanup of swig wrappers
+-- 
+2.25.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 49ea641..a3b655c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@
 makefile_dependencies.patch
 cross.patch
 gcc-10.patch
+Set-ACLOCAL_AMFLAGS-I-config.patch
 Fix-generating-man-pages-in-place.patch
 Always-update-man-pages-if-needed.patch
 ibdmsh-Correct-whatis-entry.patch
diff --git a/debian/rules b/debian/rules
index 1c2abe0..c878443 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,6 @@
 
 %:
 	dh $@
-
-override_dh_autoreconf:
-	dh_autoreconf autoreconf -- -f -i -I config
 
 override_dh_auto_configure:
 	dh_auto_configure -- --with-osm=/usr \