diff --git a/ChangeLog b/ChangeLog
index 035f18194..1b7fd4411 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Add missing -mXX to TARGET_CPPFLAGS.
+
 2011-11-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Several AFFS fixes.
diff --git a/configure.ac b/configure.ac
index e707081a7..1b3288c8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -464,6 +464,7 @@ if test "x$target_m32" = x1; then
   # Force 32-bit mode.
   TARGET_CFLAGS="$TARGET_CFLAGS -m32"
   TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m32"
+  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m32"
   TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
   TARGET_MODULE_FORMAT="elf32"
 fi
@@ -472,6 +473,7 @@ if test "x$target_m64" = x1; then
   # Force 64-bit mode.
   TARGET_CFLAGS="$TARGET_CFLAGS -m64"
   TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m64"
+  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m64"
   TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
   TARGET_MODULE_FORMAT="elf64"
 fi