diff --git a/ChangeLog b/ChangeLog
index a55448047c147f0e9b8fe5894a5beda38a9f61be..322de53b3a3e1fe81eceb2c63c611f51571fbe9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-14  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES back down.
+	* Makefile.in: Regenerate.
+
 2003-03-14  Michael Chastain  <mec@shout.net>
 
 	* Makefile.in: Regenerate with correct Makefile.def.
diff --git a/Makefile.in b/Makefile.in
index c40fd8155be3427471d67d0d1754b377eaab89fe..f70250dd8d7bfb1ca7179753c64cce224bb44306 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,10 +20,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
-# Don't pass command-line variables to submakes.
-.NOEXPORT:
-MAKEOVERRIDES=
-
 # -------------------------------
 # Standard Autoconf-set variables
 # -------------------------------
@@ -7529,10 +7525,18 @@ AUTOCONF = autoconf
 $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
 	cd $(srcdir) && $(AUTOCONF)
 
+# ------------------------------
+# Special directives to GNU Make
+# ------------------------------
+
 # Tell GNU make 3.79 not to run the top level in parallel.  This 
 # prevents contention for $builddir/$target/config.cache, as well
 # as minimizing scatter in file system caches.
 NOTPARALLEL = .NOTPARALLEL
 $(NOTPARALLEL):
 
+# Don't pass command-line variables to submakes.
+.NOEXPORT:
+MAKEOVERRIDES=
+
 # end of Makefile.in
diff --git a/Makefile.tpl b/Makefile.tpl
index ab37bdf2bebd1b2c07c4b3f39f796f72a5c2548d..72e24983c5783f5c5bb72b8d59db4e0a66b505e3 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -23,10 +23,6 @@ in
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
-# Don't pass command-line variables to submakes.
-.NOEXPORT:
-MAKEOVERRIDES=
-
 # -------------------------------
 # Standard Autoconf-set variables
 # -------------------------------
@@ -1454,10 +1450,18 @@ AUTOCONF = autoconf
 $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
 	cd $(srcdir) && $(AUTOCONF)
 
+# ------------------------------
+# Special directives to GNU Make
+# ------------------------------
+
 # Tell GNU make 3.79 not to run the top level in parallel.  This 
 # prevents contention for $builddir/$target/config.cache, as well
 # as minimizing scatter in file system caches.
 NOTPARALLEL = .NOTPARALLEL
 $(NOTPARALLEL):
 
+# Don't pass command-line variables to submakes.
+.NOEXPORT:
+MAKEOVERRIDES=
+
 # end of Makefile.in