diff --git a/ChangeLog b/ChangeLog
index 140b36f411bf36959570341a0b4a82ed06d1743a..9e8f4be8938941d627029af68331a70d9731a32b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.ac: Do not include mh-x86omitfp.
+	* configure: Regenerate.
+
 2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
 
 	* configure.ac: Remove empty cases.
diff --git a/config/ChangeLog b/config/ChangeLog
index 47baee843093c115c0809bf90847dee5189e7a2d..968f0476e0c0fb80a11eba12692057d6e5817401 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
+
+	* mh-x86omitfp: Remove.
+
 2011-03-24  Paolo Bonzini  <bonzini@gnu.org>
 
 	* mh-cygwin: Remove obsolete variables and dependencies.
diff --git a/config/mh-x86omitfp b/config/mh-x86omitfp
deleted file mode 100644
index 7f536c8ba2e1cc9d6728777864b1cb1940307a63..0000000000000000000000000000000000000000
--- a/config/mh-x86omitfp
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add -fomit-frame-pointer to the usual BOOT_CFLAGS to speed up the compiler.
-BOOT_CFLAGS += -fomit-frame-pointer
diff --git a/configure b/configure
index 4eebc45d441d4215c009e000014612b04e37023b..e823f9e6bf69d2a9b087dd4f643734527d849175 100755
--- a/configure
+++ b/configure
@@ -3641,11 +3641,6 @@ fi
   rs6000-*-aix*)
     host_makefile_frag="config/mh-ppc-aix"
     ;;
-  # This is placed last to prevent interfering with the cases above.
-  i[3456789]86-*-*)
-    # Build the stage2 and stage3 compilers with -fomit-frame-pointer.
-    host_makefile_frag="config/mh-x86omitfp"
-    ;;
 esac
 fi
 
diff --git a/configure.ac b/configure.ac
index fbf64fe714740a325932cbafe572bebba552298a..78abc7c2d85a6129dd838c8ae5e524f631e3f1ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1068,11 +1068,6 @@ case "${host}" in
   rs6000-*-aix*)
     host_makefile_frag="config/mh-ppc-aix"
     ;;
-  # This is placed last to prevent interfering with the cases above.
-  i[[3456789]]86-*-*)
-    # Build the stage2 and stage3 compilers with -fomit-frame-pointer.
-    host_makefile_frag="config/mh-x86omitfp"
-    ;;
 esac
 fi