--- bin/autoreconf.in.orig
+++ bin/autoreconf.in
@@ -128,14 +128,14 @@
   autoconf    => $ENV{'AUTOCONF'}    || '@bindir@/@autoconf-name@',
   autoheader  => $ENV{'AUTOHEADER'}  || '@bindir@/@autoheader-name@',
   autom4te    => $ENV{'AUTOM4TE'}    || '@bindir@/@autom4te-name@',
-  automake    => $ENV{'AUTOMAKE'}    || 'automake',
-  aclocal     => $ENV{'ACLOCAL'}     || 'aclocal',
-  libtoolize  => $ENV{'LIBTOOLIZE'}  || 'libtoolize',
-  intltoolize => $ENV{'INTLTOOLIZE'} || 'intltoolize',
-  gtkdocize   => $ENV{'GTKDOCIZE'}   || 'gtkdocize',
-  autopoint   => $ENV{'AUTOPOINT'}   || 'autopoint',
+  automake    => $ENV{'AUTOMAKE'}    || '@bindir@/automake',
+  aclocal     => $ENV{'ACLOCAL'}     || '@bindir@/aclocal',
+  libtoolize  => $ENV{'LIBTOOLIZE'}  || '@bindir@/glibtoolize',
+  intltoolize => $ENV{'INTLTOOLIZE'} || '@bindir@/intltoolize',
+  gtkdocize   => $ENV{'GTKDOCIZE'}   || '@bindir@/gtkdocize',
+  autopoint   => $ENV{'AUTOPOINT'}   || '@bindir@/autopoint',
   make        => $ENV{'MAKE'}        || 'make',
-  m4          => $ENV{'M4'}          || 'm4',
+  m4          => $ENV{'M4'}          || '@bindir@/m4',
 );
 
 # For any command $cmd in %C, if $cmd_excluded{$cmd} exists, the program
--- man/autoreconf.1.orig
+++ man/autoreconf.1
@@ -7,7 +7,7 @@
 [\fI\,OPTION\/\fR]... [\fI\,DIRECTORY\/\fR]...
 .SH DESCRIPTION
 Run 'autoconf' and, when needed, 'aclocal', 'autoheader', 'automake',
-\&'autopoint' (formerly 'gettextize'), 'libtoolize', 'intltoolize', and
+\&'autopoint' (formerly 'gettextize'), 'glibtoolize', 'intltoolize', and
 \&'gtkdocize' to regenerate the GNU Build System files in specified
 DIRECTORIES and their subdirectories (defaulting to '.').
 .PP
@@ -134,7 +134,7 @@
 .BR config.guess (1),
 .BR config.sub (1),
 .BR ifnames (1),
-.BR libtool (1).
+.BR glibtool (1).
 
 The full documentation for Autoconf is maintained as a Texinfo manual.
 To read the manual locally, use the command
--- tests/foreign.at.orig
+++ tests/foreign.at
@@ -26,12 +26,12 @@
 AT_SETUP([Libtool])
 
 # Skip this test if there is no libtoolize.
-AT_CHECK([libtoolize --version || exit 77],
+AT_CHECK([glibtoolize --version || exit 77],
 	 [ignore], [ignore], [ignore])
 # Modern Libtool has further tests for compatibility with older autoconf;
 # from the Autoconf side, we will merely assume newer libtool.
 AT_CHECK([[
-case `libtoolize --version |
+case `glibtoolize --version |
       sed -n '/^.* \([0-9][0-9.a-z]*\)$/{
 		s//\1/
 		p
@@ -50,7 +50,7 @@
 AC_CONFIG_AUX_DIR([.])
 AC_PROG_LIBTOOL
 ]])
-AT_CHECK([LC_ALL=C libtoolize -i], [0], [stdout], [ignore])
+AT_CHECK([LC_ALL=C glibtoolize -i], [0], [stdout], [ignore])
 
 # Some broken libtoolize fail to install a functional config.guess.
 AT_CHECK([LC_ALL=C ./config.guess || exit 77], [], [ignore], [ignore])
