diff --git a/ChangeLog b/ChangeLog
index a80606f46..a8fab4bcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Refuse to compile for x86_64-efi is mcmodel=large
+	is not supported.
+
 2010-04-19  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	Add grub-mkconfig support for NetBSD.
diff --git a/configure.ac b/configure.ac
index 5b959fb01..28b3c1d95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -413,9 +413,7 @@ if test "$target_cpu"-"$platform" = x86_64-efi; then
 		      [grub_cv_cc_mcmodel=no])
   ])
   if test "x$grub_cv_cc_mcmodel" = xno; then
-    CFLAGS="$SAVED_CFLAGS -m64 -DMCMODEL_SMALL=1"
-    TARGET_CFLAGS="$TARGET_CFLAGS -DMCMODEL_SMALL=1"
-    AC_MSG_WARN([-mcmodel=large not supported. You won't be able to use the memory over 4GiB. Upgrade your gcc])
+    AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.])
   else
     TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
   fi