diff --git a/ChangeLog b/ChangeLog
index ff5f609e..f58d6784 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-02-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* bootstrap: Also set GREP, FGREP, EGREP, LN_S, when creating a
+	preliminary ltmain.sh script.
+
 	* doc/libtool.texi (Test descriptions): Track the grand test
 	suite renaming from 2003-10-14 in the tests documentation.
 	assign.test is merged into sh.test.  Fix description of sh.test.
diff --git a/bootstrap b/bootstrap
index 2814bb07..a53bcb8e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -132,7 +132,8 @@ $MAKE ./$auxdir/ltmain.sh ./$m4dir/ltversion.m4 ./doc/notes.txt \
     ./tests/testsuite ./libltdl/Makefile.am \
     srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" \
     PACKAGE_BUGREPORT="bug-$2@gnu.org" M4SH="$AUTOM4TE --language=m4sh" \
-    AUTOTEST="$AUTOM4TE --language=autotest" SED="$SED" MAKEINFO="$MAKEINFO"
+    AUTOTEST="$AUTOM4TE --language=autotest" SED="$SED" MAKEINFO="$MAKEINFO" \
+    GREP="$GREP" FGREP="$FGREP" EGREP="$EGREP" LN_S="$LN_S"
 
 test -f clcommit.m4sh && $MAKE -f Makefile.maint ./commit \
     srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" M4SH="$AUTOM4TE -l m4sh" \