diff --git a/ChangeLog b/ChangeLog
index b4b986fe7ee8c317244280e71070e11e22f692cb..57ad616371a7af0fd80b8150e128a1516f9444dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-11  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* Makefile.in (CFLAGS_FOR_TARGET): Add -O2.
+
 2002-06-08  Jason Thorpe  <thorpej@wasabisystems.com>
 
 	* configure.in (vax-*-netbsd*): Re-enable gas.
diff --git a/Makefile.in b/Makefile.in
index 9d3d677978e30d41d89eef983b0ac0d8a24c817c..4a761096539bb18528e5f93f2abd4ba8a2f533e9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,7 +100,11 @@ CXXFLAGS = -g -O2
 LDFLAGS = 
 LIBCFLAGS = $(CFLAGS)
 CFLAGS_FOR_BUILD = $(CFLAGS)
-CFLAGS_FOR_TARGET = $(CFLAGS)
+# During gcc bootstrap, if we use some random cc for stage1 then
+# CFLAGS will be just -g.  We want to ensure that TARGET libraries
+# (which we know are built with gcc) are built with optimizations so
+# prepend -O2 when setting CFLAGS_FOR_TARGET.
+CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
 LDFLAGS_FOR_TARGET = 
 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 PICFLAG =