diff --git a/ChangeLog b/ChangeLog
index 591e1ef15..0cd6e7261 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Make efiemu test cflags match the cflags efiemu is
+	compiled with.
+
 2013-11-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix grub_machine_fini bitrot.
diff --git a/configure.ac b/configure.ac
index cc6e8b5bd..579acb882 100644
--- a/configure.ac
+++ b/configure.ac
@@ -668,7 +668,7 @@ if test x"$platform" = xefi ; then
 fi
 if test x"$efiemu_excuse" = x ; then
   AC_CACHE_CHECK([whether options required for efiemu work], grub_cv_cc_efiemu, [
-    CFLAGS="$TARGET_CFLAGS -march=core2 -m64 -mcmodel=large -mno-red-zone -nostdlib"
+    CFLAGS="-m64 -nostdlib -O2 -mcmodel=large -mno-red-zone"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
 		      [grub_cv_cc_efiemu=yes],
 		      [grub_cv_cc_efiemu=no])