diff --git a/ChangeLog b/ChangeLog
index 9485411f7..492a553e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-03-24  Nathanael Nerode  <neroden@gcc.gnu.org>
 
+	* Makefile.tpl (top level bootstrap support): Remove now-unneeded
+	STRICT_WARN, WARN_CFLAGS flags passed down to make.
+	* Makefile.in: Regenerate.
+
 	* configure.in (top level bootstrap support): Rework --enable-werror
 	to set @stage2_werror_flag@.
 	* configure: Regenerate.
diff --git a/Makefile.in b/Makefile.in
index 2a88b90fa..593566086 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24101,9 +24101,7 @@ configure-stage2-gcc: all-stage1-gcc
 BOOT_CFLAGS= -g -O2
 POSTSTAGE1_FLAGS_TO_PASS = \
 	CFLAGS="$(BOOT_CFLAGS)" \
-	ADAC="\$$(CC)" \
-	WARN_CFLAGS="\$$(GCC_WARN_CFLAGS)" \
-	STRICT_WARN="\$$(STRICT2_WARN)"
+	ADAC="\$$(CC)"
 
 all-stage2-gcc: all-stage1-gcc configure-stage2-gcc
 	echo all-stage2-gcc > stage_last ; \
diff --git a/Makefile.tpl b/Makefile.tpl
index 4fef85bf3..cd7e06ecc 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1429,9 +1429,7 @@ configure-stage2-gcc: all-stage1-gcc
 BOOT_CFLAGS= -g -O2
 POSTSTAGE1_FLAGS_TO_PASS = \
 	CFLAGS="$(BOOT_CFLAGS)" \
-	ADAC="\$$(CC)" \
-	WARN_CFLAGS="\$$(GCC_WARN_CFLAGS)" \
-	STRICT_WARN="\$$(STRICT2_WARN)"
+	ADAC="\$$(CC)"
 
 all-stage2-gcc: all-stage1-gcc configure-stage2-gcc
 	echo all-stage2-gcc > stage_last ; \