diff --git a/Makefile.am b/Makefile.am
index dbf234e..ec1a2bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,17 +33,6 @@ pm_DATA = lib/Stow.pm
 pmstow_DATA = lib/Stow/Util.pm
 
 export TEXI2DVI_BUILD_MODE = clean
-AM_MAKEINFOFLAGS = -I $(srcdir)
-
-# We require this -I parameter to ensure that the include of the
-# default ignore list in the manual works.  Unfortunately this is
-# the only way to do it:
-#
-#   https://lists.gnu.org/archive/html/bug-automake/2008-09/msg00040.html
-#
-# even though it annoyingly produces a warning with the -Wall option
-# to AM_INIT_AUTOMAKE which has to be silenced via -Wno-override.
-TEXI2DVI = texi2dvi $(AM_MAKEINFOFLAGS)
 
 doc_deps = $(info_TEXINFOS) doc/version.texi
 
diff --git a/configure.ac b/configure.ac
index cd7dc4f..1af78e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,8 +19,7 @@ AC_INIT([stow], [2.3.2], [bug-stow@gnu.org])
 AC_PREREQ([2.61])
 AC_CONFIG_AUX_DIR([automake])
 # Unfortunately we have to disable warnings for overrides, because we
-# need to override the built-in `check' rule and also the TEXI2DVI
-# variable.
+# need to override the built-in `check' rule.
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-override dist-bzip2 foreign])
 AC_PROG_INSTALL