diff --git a/_autosetup b/_autosetup
index 9c718476dd..da342b66be 100755
--- a/_autosetup
+++ b/_autosetup
@@ -16,7 +16,7 @@ fi
 
 echo "Bootstrapping configure script and makefiles:"
 
-aclocal -I m4 && automake && autoconf && autoheader
+aclocal -I m4 && autoheader && automake && autoconf 
 
 ## We don't always run ./configure ourselves here, because the user may not
 ## want to run it, or may want to run with custom parameters.
diff --git a/checkin_notes b/checkin_notes
index 1b7aa2031b..9f3e85b130 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -20040,7 +20040,11 @@ Bruce 23 Nov 2004 UTC
     - Added .cvsignore file for zip/ directory.
     - Modified api/boinc_gl.h to use config.h to get correct include path for glut.h
     - Added double-inclusion protection for config.h to avoid some warning messages
+    - Run autoheader BEFORE automake and autoconf in _autosetup
+    - Removed huge number of extraneous Makefile.in's
+    - Changed production of config.h from AM_ to AC_ macro
 
+    _autosetup
     configure.ac
     Makefile.am
     config.h
diff --git a/configure.ac b/configure.ac
index 0edd748ac9..6a4953694b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -306,8 +306,8 @@ AC_CONFIG_FILES([
                  zip/Makefile
                  ])
 
-dnl AC_CONFIG_HEADER([config.h])
-AM_CONFIG_HEADER([config.h])
+dnl AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 AC_OUTPUT