diff --git a/ChangeLog b/ChangeLog
index 53a1818b4..ebc6726ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Don't add -m32/-m64 on emu.
+
 2013-11-02  neil
 
 	* grub-core/osdep/linux/blocklist.c: Include linux/types.h for some
diff --git a/configure.ac b/configure.ac
index 83ab04412..16768804d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,10 +163,12 @@ case "$target_cpu"-"$platform" in
   *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
 esac
 
-case "$target_cpu" in
-  i386 | powerpc) target_m32=1 ;;
-  x86_64 | sparc64) target_m64=1 ;;
-esac
+if [ x$platform != xemu ]; then
+   case "$target_cpu" in
+	i386 | powerpc) target_m32=1 ;;
+	x86_64 | sparc64) target_m64=1 ;;
+   esac
+fi
 
 case "$target_os" in
   windows* | mingw32*) target_os=cygwin ;;