diff --git a/README b/README
index e03debe8..1444d4d3 100644
--- a/README
+++ b/README
@@ -77,17 +77,16 @@ or for a release version X.Y.*'s branch:
 Next you will need to prepare the GNU Autotools build system, if you
 are using Linux, Mac OS X, or Cygwin. Enter the target directory of
 the checkout command you used ('gtest-svn' or 'gtest-X.Y-svn' above)
-and proceed with the following commands:
+and proceed with the following command to bootstrap the build system:
 
-  $ aclocal-1.9       # Where "1.9" must match the following automake command.
-  $ libtoolize -c     # Use "glibtoolize -c" instead on Mac OS X.
-  $ autoheader
-  $ automake-1.9 -ac  # See Automake version requirements above.
-  $ autoconf
+  $ ACLOCAL=aclocal-1.9 AUTOMAKE=automake-1.9 autoreconf -fiv
 
-While this is a bit complicated, it will most often be automatically re-run by
-your "make" invocations, so in practice you shouldn't need to worry too much.
-Once you have completed these steps, you are ready to build the library. 
+You can substitute newer versions of 'aclocal' and 'automake', but be aware
+that older versions are known not to work, and autoreconf may or may not
+correctly detect the required version. Also, the versions must match for both
+commands. However, this entire process will be automatically re-run by your
+"make" invocations, so in practice you shouldn't need to worry too much. Once
+you have completed these steps, you are ready to build the library.
 
 ### Source Package: ###
 Google Test is also released in source packages which can be downloaded from
diff --git a/config_aux/.keep b/build-aux/.keep
similarity index 100%
rename from config_aux/.keep
rename to build-aux/.keep
diff --git a/configure.ac b/configure.ac
index bb21a603..14a354bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,8 @@ AC_INIT([Google C++ Testing Framework],
 # Provide various options to initialize the Autoconf and configure processes.
 AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([./COPYING])
-AC_CONFIG_AUX_DIR([config_aux])
-AC_CONFIG_HEADERS([config_aux/config.h])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_HEADERS([build-aux/config.h])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([scripts/gtest-config], [chmod +x scripts/gtest-config])
 
@@ -31,7 +31,6 @@ AC_PROG_LIBTOOL
 # HAVE_PYTHON by requiring "python" to be in the PATH, and that interpreter's
 # version to be >= 2.3. This will allow the scripts to use a "/usr/bin/env"
 # hashbang.
-#AM_PATH_PYTHON([2.3],,[:])
 PYTHON=  # We *do not* allow the user to specify a python interpreter
 AC_PATH_PROG([PYTHON],[python],[:])
 AS_IF([test "$PYTHON" != ":"],