diff --git a/libffi/ChangeLog.libffi b/libffi/ChangeLog.libffi
index 72b2781a..9860c528 100644
--- a/libffi/ChangeLog.libffi
+++ b/libffi/ChangeLog.libffi
@@ -1,3 +1,9 @@
+2008-02-22  Bjoern Koenig  <bkoenig@alpha-tierchen.de>
+	    Andreas Tobler  <a.tobler@schweiz.org>
+
+	* configure.ac: Add amd64-*-freebsd* target.
+	* configure: Regenerate.
+
 2008-02-22  Thomas Heller <theller@ctypes.org>
 
 	* configure.ac: Add x86 OpenBSD support.
diff --git a/libffi/configure.ac b/libffi/configure.ac
index 01572e25..9a7fb4fe 100644
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -49,6 +49,10 @@ case "$host" in
 	TARGET=ARM; TARGETDIR=arm
 	;;
 
+  amd64-*-freebsd*)
+	TARGET=X86_64; TARGETDIR=x86
+  	;;
+
   cris-*-*)
 	TARGET=LIBFFI_CRIS; TARGETDIR=cris
 	;;