diff --git a/ChangeLog b/ChangeLog
index 227774a3c0d..97e3d67c463 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-05  Sebastian Pop  <sebpop@gmail.com>
+
+	PR bootstrap/32622
+	* config/mh-x86omitfp (BOOT_CFLAGS): Add -fomit-frame-pointer,
+	don't reset its value.
+
 2007-07-05  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	* MAINTAINERS (OS Port Maintainers): Add myself as IRIX, Tru64 UNIX
diff --git a/config/mh-x86omitfp b/config/mh-x86omitfp
index 563f02ba0a9..7f536c8ba2e 100644
--- a/config/mh-x86omitfp
+++ b/config/mh-x86omitfp
@@ -1,2 +1,2 @@
 # Add -fomit-frame-pointer to the usual BOOT_CFLAGS to speed up the compiler.
-BOOT_CFLAGS = -O2 -g -fomit-frame-pointer
+BOOT_CFLAGS += -fomit-frame-pointer