diff --git a/mozilla/build/autoconf/altoptions.m4 b/mozilla/build/autoconf/altoptions.m4
index 2d5701030a5..0ca95e85f1c 100644
--- a/mozilla/build/autoconf/altoptions.m4
+++ b/mozilla/build/autoconf/altoptions.m4
@@ -99,7 +99,7 @@ dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
 AC_DEFUN(MOZ_READ_MOZCONFIG,
 [AC_REQUIRE([AC_INIT_BINSH])dnl
 # Read in '.mozconfig' script to set the initial options.
-# See the load-mozconfig.sh script for more details.
+# See the mozconfig2configure script for more details.
 _AUTOCONF_TOOLS_DIR=`dirname [$]0`/[$1]/build/autoconf
 . $_AUTOCONF_TOOLS_DIR/mozconfig2configure])
 
diff --git a/mozilla/build/autoconf/mozconfig-find b/mozilla/build/autoconf/mozconfig-find
index 683bfd63d70..32b5e04d6e4 100755
--- a/mozilla/build/autoconf/mozconfig-find
+++ b/mozilla/build/autoconf/mozconfig-find
@@ -17,10 +17,10 @@
 # Copyright (C) 1999 Netscape Communications Corporation. All
 # Rights Reserved.
 #
-# Contributor(s): 
+# Contributor(s): Stephen Lamm <slamm@netscape.com>
 #
 
-# find-mozconfig.sh - Loads options from .mozconfig onto configure's
+# mozconfigfind - Loads options from .mozconfig onto configure's
 #    command-line. The .mozconfig file is searched for in the 
 #    order:
 #       if $MOZCONFIG is set, use that.
diff --git a/mozilla/build/autoconf/mozconfig2configure b/mozilla/build/autoconf/mozconfig2configure
index c4a05501867..3331764d076 100755
--- a/mozilla/build/autoconf/mozconfig2configure
+++ b/mozilla/build/autoconf/mozconfig2configure
@@ -17,10 +17,10 @@
 # Copyright (C) 1999 Netscape Communications Corporation. All
 # Rights Reserved.
 #
-# Contributor(s): 
+# Contributor(s): Stephen Lamm <slamm@netscape.com>
 #
 
-# load-mozconfig.sh - Loads options from .mozconfig onto configure's
+# mozconfig2configure - Loads options from .mozconfig onto configure's
 #    command-line. See find-mozconfig.sh for how the config file is
 #    found
 #
@@ -39,8 +39,6 @@
 #
 # ac_add_options can be called multiple times in .mozconfig.
 #    Each call adds more options to configure's command-line.
-#
-# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
 
 # Note: $_AUTOCONF_TOOLS_DIR must be defined in the script that includes this.
 
@@ -66,7 +64,7 @@ mk_add_options() {
 }
 
 ac_echo_options() {
-  echo "Adding options from $MOZCONFIG:"
+  echo "Adding configure options from $MOZCONFIG:"
   eval "set -- $mozconfig_ac_options"
   for _opt
   do