diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index da2b67b0a405..3fd628f8334b 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-27  Bo Thorsen  <bo@suse.de>
+
+	* include/ffi.h.in: Fix multilib x86-64 support.
+
 2002-09-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* Makefile.am (all-multi): Fix multilib parallel build.
diff --git a/libffi/include/ffi.h.in b/libffi/include/ffi.h.in
index 8fc37f56f4ee..7cb1aa652fcc 100644
--- a/libffi/include/ffi.h.in
+++ b/libffi/include/ffi.h.in
@@ -187,17 +187,6 @@ typedef enum ffi_abi {
 #else
   FFI_DEFAULT_ABI = FFI_V8,
 #endif
-#endif
-
-  /* ---- Intel x86 and AMD x86-64 - */
-#if defined(X86) || defined(X86_64)
-  FFI_SYSV,
-  FFI_UNIX64,   /* Unix variants all use the same ABI for x86-64  */
-#ifdef X86
-  FFI_DEFAULT_ABI = FFI_SYSV,
-#else
-  FFI_DEFAULT_ABI = FFI_UNIX64,
-#endif
 #endif
 
   /* ---- Intel x86 Win32 ---------- */
@@ -206,6 +195,17 @@ typedef enum ffi_abi {
   FFI_DEFAULT_ABI = FFI_SYSV,
 #endif
 
+  /* ---- Intel x86 and AMD x86-64 - */
+#if defined(__i386__) || defined(__x86_64__)
+  FFI_SYSV,
+  FFI_UNIX64,   /* Unix variants all use the same ABI for x86-64  */
+#ifdef __i386__
+  FFI_DEFAULT_ABI = FFI_SYSV,
+#else
+  FFI_DEFAULT_ABI = FFI_UNIX64,
+#endif
+#endif
+
   /* ---- Intel ia64 ---------------- */
 #ifdef IA64
   FFI_UNIX,   	/* Linux and all Unix variants use the same conventions	*/
@@ -390,13 +390,7 @@ size_t ffi_java_raw_size (ffi_cif *cif);
 
 /* ---- Definitions for closures ----------------------------------------- */
 
-#ifdef X86
-
-#define FFI_CLOSURES 1		/* x86 supports closures */
-#define FFI_TRAMPOLINE_SIZE 10
-#define FFI_NATIVE_RAW_API 1	/* and has native raw api support */
-
-#elif defined(X86_WIN32)
+#ifdef __i386__
 
 #define FFI_CLOSURES 1		/* x86 supports closures */
 #define FFI_TRAMPOLINE_SIZE 10