diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 27760849cf0..55553ba9404 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* configure.ac (i?86-*-solaris2.1[0-9]): Set TARGET to X86_64.
+	* configure: Regenerate.
+
 2007-07-11  David Daney  <ddaney@avtrex.com>
 
 	* src/mips/ffi.c: Don't include sys/cachectl.h.
diff --git a/libffi/configure b/libffi/configure
index 5aa05d5b357..404475f353c 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -10305,6 +10305,9 @@ case "$host" in
   i?86-*-darwin*)
 	TARGET=X86_DARWIN; TARGETDIR=x86
 	;;
+  i?86-*-solaris2.1[0-9]*)
+	TARGET=X86_64; TARGETDIR=x86
+	;;
   i?86-*-*)
 	TARGET=X86; TARGETDIR=x86
 	;;
diff --git a/libffi/configure.ac b/libffi/configure.ac
index 92c5678c934..6c7a9d26969 100644
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -75,6 +75,9 @@ case "$host" in
   i?86-*-darwin*)
 	TARGET=X86_DARWIN; TARGETDIR=x86
 	;;
+  i?86-*-solaris2.1[[0-9]]*)
+	TARGET=X86_64; TARGETDIR=x86
+	;;
   i?86-*-*)
 	TARGET=X86; TARGETDIR=x86
 	;;