diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 0d14813f74f..276d738caa4 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-21  Andreas Tobler  <a.tobler@schweiz.org>
+
+	* configure.ac: Make i?86 build on FreeBSD and OpenBSD.
+	* configure: Regenerate.
+
 2009-12-15  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* testsuite/libffi.call/ffitest.h: Define PRIuPTR on PA HP-UX.
diff --git a/libffi/configure b/libffi/configure
index 6a02c079a21..cdefd57f215 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -11347,7 +11347,7 @@ case "$host" in
 	TARGET=PA_HPUX; TARGETDIR=pa
 	;;
 
-  i386-*-freebsd* | i386-*-openbsd*)
+  i?86-*-freebsd* | i?86-*-openbsd*)
 	TARGET=X86_FREEBSD; TARGETDIR=x86
 	;;
   i?86-win32* | i?86-*-cygwin* | i?86-*-mingw*)
diff --git a/libffi/configure.ac b/libffi/configure.ac
index 917f3f1cbc0..3c1b1bcee43 100644
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -73,7 +73,7 @@ case "$host" in
 	TARGET=PA_HPUX; TARGETDIR=pa
 	;;
 
-  i386-*-freebsd* | i386-*-openbsd*)
+  i?86-*-freebsd* | i?86-*-openbsd*)
 	TARGET=X86_FREEBSD; TARGETDIR=x86
 	;;
   i?86-win32* | i?86-*-cygwin* | i?86-*-mingw*)