diff --git a/ChangeLog b/ChangeLog
index 45264f88..c6e82132 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2003-10-15  Gary V. Vaughan  <gary@gnu.org>
 
+	* bootstrap: Make the fake files valid shell scripts with a
+	comment incase they get left around.
+	(LIBTOOLIZE): Use a dummy script to prevent the installed
+	`libtoolize' from trashing the distributed libtool.m4,
+	config.guess and config.sub.
+
 	* configure.ac (AC_CONFIG_TESTDIR, AC_CONFIG_TESTFILES): Comment
 	this out for now, the autotest testsuite rewrite is not ready
 	yet.
diff --git a/bootstrap b/bootstrap
index 02c8d638..1a6b4ec1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,9 +1,9 @@
 #! /bin/sh
 
-# helps bootstrapping libtool, when checked out from CVS
-# requires at least GNU autoconf 2.58 and GNU automake 1.8
+# Helps bootstrapping libtool, when checked out from CVS
+# requires at least GNU autoconf 2.58 and GNU automake 1.8.
 
-# Upgrade caveat
+# Upgrade caveat.
 
 cat <<'EOF'
 WARNING: If bootstrapping with this script fails, it may be due to an
@@ -16,12 +16,23 @@ EOF
 
 rm -rf `find . \( -name autom4te.cache -o -name libtool \) -print`
 
-fakes="config/ltmain.sh config/libtoolize libltdl/ltmain.sh libltdl/libtoolize"
+fakes="config/ltmain.sh config/libtoolize libltdl/ltmain.sh"
 
 for file in $fakes; do
-  touch $file
+  cat > $file <<'EOF'
+#! /bin/sh
+# This is a dummy file for bootstrapping CVS libtool.
+echo "$0: Bootstrap detected, no files installed." | sed 's,^.*/,,g'
+exit 0
+EOF
+  chmod 755 $file
 done
 
+# Running the installed `libtoolize' will trash the local (newer) libtool.m4
+# among others.  Call the dummy script we made earlier.
+LIBTOOLIZE=`pwd`/config/libtoolize
+export LIBTOOLIZE
+
 for sub in . tests/*demo tests/*demo[1-9]; do
   autoreconf --force --verbose --install $sub
 done