diff --git a/libffi/ChangeLog.libffi b/libffi/ChangeLog.libffi
index efcfc81e..72b2781a 100644
--- a/libffi/ChangeLog.libffi
+++ b/libffi/ChangeLog.libffi
@@ -1,3 +1,8 @@
+2008-02-22  Thomas Heller <theller@ctypes.org>
+
+	* configure.ac: Add x86 OpenBSD support.
+	* configure: Rebuilt.
+
 2008-02-21  Thomas Heller <theller@ctypes.org>
 
 	* README: Change "make test" to "make check".
diff --git a/libffi/configure b/libffi/configure
index 855d8131..2c6ece19 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -20390,7 +20390,7 @@ case "$host" in
 	TARGET=PA_HPUX; TARGETDIR=pa
 	;;
 
-  i386-*-freebsd*)
+  i386-*-freebsd* | i386-*-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 2e9f5149..01572e25 100644
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -67,7 +67,7 @@ case "$host" in
 	TARGET=PA_HPUX; TARGETDIR=pa
 	;;
 
-  i386-*-freebsd*)
+  i386-*-freebsd* | i386-*-openbsd)
 	TARGET=X86_FREEBSD; TARGETDIR=x86
 	;;
   i?86-win32* | i?86-*-cygwin* | i?86-*-mingw*)