diff --git a/ChangeLog b/ChangeLog
index 5b0b35706..db874e50d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Don't use extended registers on x86_64.
+	Reported by: Peter Jones.
+
 2013-05-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/term/efi/console.c: Fix compile error.
diff --git a/configure.ac b/configure.ac
index 6c310f779..80549b000 100644
--- a/configure.ac
+++ b/configure.ac
@@ -464,7 +464,9 @@ if test "x$target_cpu" = xi386; then
   else
     TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"
   fi
+fi
 
+if test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64; then
   # Some toolchains enable these features by default, but they need
   # registers that aren't set up properly in GRUB.
   TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-3dnow"