diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 2dc82af5111..63e99be4fb3 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-12  Bjoern Koenig  <bkoenig@alpha-tierchen.de>
+	    Andreas Tobler  <a.tobler@schweiz.org>
+
+	* configure.ac: Add amd64-*-freebsd* target.
+	* configure: Regenerate.
+
 2008-01-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR libffi/34612
diff --git a/libffi/configure b/libffi/configure
index 9fe4b69b06f..975a1bcbb32 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -10281,6 +10281,10 @@ case "$host" in
 	TARGET=ARM; TARGETDIR=arm
 	;;
 
+  amd64-*-freebsd*)
+	TARGET=X86_64; TARGETDIR=x86
+	;;
+
   cris-*-*)
 	TARGET=LIBFFI_CRIS; TARGETDIR=cris
 	;;
diff --git a/libffi/configure.ac b/libffi/configure.ac
index 412a86d2105..5d0830b8039 100644
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -51,6 +51,10 @@ case "$host" in
 	TARGET=ARM; TARGETDIR=arm
 	;;
 
+  amd64-*-freebsd*)
+	TARGET=X86_64; TARGETDIR=x86
+	;;
+
   cris-*-*)
 	TARGET=LIBFFI_CRIS; TARGETDIR=cris
 	;;