diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index ef56084d802b25731c1efec29db884ce7bb006d9..536d6639f3ff372caba4e028c6a872e6c5095829 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-10  Alfred M. Szmidt  <ams@gnu.org>
+
+	PR libffi/21819:
+	* configure: Rebuilt.
+	* configure.ac: Handle i*86-*-gnu*.
+
 2005-08-09  Jakub Jelinek  <jakub@redhat.com>
 
 	* src/powerpc/ppc_closure.S (ffi_closure_SYSV): Use
diff --git a/libffi/configure b/libffi/configure
index e2dab2f95141cbfb80bb1acc02b46c2bab84644a..07ac781d2987fb3d0b802fa8002ee95fba81df9d 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -5377,6 +5377,7 @@ fi
 TARGETDIR="unknown"
 case "$host" in
 i*86-*-linux*) TARGET=X86; TARGETDIR=x86;;
+i*86-*-gnu*) TARGET=X86; TARGETDIR=x86;;
 i*86-*-solaris2.1[0-9]*) TARGET=X86_64; TARGETDIR=x86;;
 i*86-*-solaris*) TARGET=X86; TARGETDIR=x86;;
 i*86-*-beos*) TARGET=X86; TARGETDIR=x86;;
diff --git a/libffi/configure.ac b/libffi/configure.ac
index 35c12319a9d478d3abe3276cff32e2e1157ffa88..2bf13f6cde7b5ab1947221e3f35eb5b19b88550e 100644
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -42,6 +42,7 @@ AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite)
 TARGETDIR="unknown"
 case "$host" in
 i*86-*-linux*) TARGET=X86; TARGETDIR=x86;;
+i*86-*-gnu*) TARGET=X86; TARGETDIR=x86;;
 i*86-*-solaris2.1[[0-9]]*) TARGET=X86_64; TARGETDIR=x86;;
 i*86-*-solaris*) TARGET=X86; TARGETDIR=x86;;
 i*86-*-beos*) TARGET=X86; TARGETDIR=x86;;