diff --git a/ChangeLog b/ChangeLog
index df2789bb6..13e48acf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Restore CFLAGS after efiemu check.
+
 2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Move -fnested-functions to CPPFLAGS to workaround
diff --git a/configure.ac b/configure.ac
index b50f3c930..4b64653c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -513,10 +513,12 @@ 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, [
+    SAVED_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -m64 -mcmodel=large -mno-red-zone -nostdlib"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
 		      [grub_cv_cc_efiemu=yes],
 		      [grub_cv_cc_efiemu=no])
+    CFLAGS="$SAVED_CFLAGS"
   ])
   if test x$grub_cv_cc_efiemu = xno; then
      efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"