diff --git a/ChangeLog b/ChangeLog
index 498df04e2654ae2a6d4e7a6c4ba108c6d37183dc..c77eb86cd23ce9ca4e8aced38b7d6a5f2c8c0ffd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Thu Sep 18 21:43:23 1997  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
 	* Makefile.in (bootstrap2, bootstrap3): New targets.
 	(all-bootstrap): Remove outdated and confusing target.
+	(bootstrap, bootstrap2, bootstrap3): Don't pass BOOT_CFLAGS down.
 
 1997-09-15 02:37  Ulrich Drepper  <drepper@cygnus.com>
 
diff --git a/Makefile.in b/Makefile.in
index dc0fb1a0bd9696ea546c415151710af5418e605f..bdb09d715af8c71d5f60d58749c14e06ce35678b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1288,13 +1288,13 @@ bootstrap bootstrap2 bootstrap3: all-texinfo all-bison all-byacc all-binutils al
 	@r=`pwd`; export r; \
 	s=`cd $(srcdir); pwd`; export s; \
 	$(SET_LIB_PATH) \
-	echo "Bootstrapping the compiler with -O2 -g"; \
-	cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) BOOT_CFLAGS="-O2 -g" $@
+	echo "Bootstrapping the compiler"; \
+	cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) $@
 	@r=`pwd`; export r; \
 	s=`cd $(srcdir); pwd`; export s; \
 	$(SET_LIB_PATH) \
 	echo "Comparing stage2 and stage3 of the compiler"; \
-	cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) BOOT_CFLAGS="-O2 -g" compare
+	cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) compare
 	@echo "Building runtime libraries"; \
 	$(MAKE) all