diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 28558999163..a13e39c1fd0 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-09  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* configure.ac (i?86-*-*): Set TARGET to X86_64.
+	* configure: Regenerate.
+
 2011-12-07  Andrew Pinski  <apinski@cavium.com>
 
 	PR libffi/50051
diff --git a/libffi/configure b/libffi/configure
index 3abd665a6f7..7a7d24559c3 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -11368,7 +11368,7 @@ case "$host" in
 	TARGET=X86_64; TARGETDIR=x86
 	;;
   i?86-*-*)
-	TARGET=X86; TARGETDIR=x86
+	TARGET=X86_64; TARGETDIR=x86
 	;;
 
   ia64*-*-*)
diff --git a/libffi/configure.ac b/libffi/configure.ac
index 2c673354ff2..0788b3165dd 100644
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -99,7 +99,7 @@ case "$host" in
 	TARGET=X86_64; TARGETDIR=x86
 	;;
   i?86-*-*)
-	TARGET=X86; TARGETDIR=x86
+	TARGET=X86_64; TARGETDIR=x86
 	;;
 
   ia64*-*-*)