diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 29f4ec68f58..8e41e956c5b 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-06  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* include/ffi_mips.h: Define FFI_MIPS_N32 for N32/N64 ABIs,
+	FFI_MIPS_O32 for O32 ABI.
+
 2003-10-01  Andreas Tobler  <a.tobler@schweiz.ch>
 
 	* testsuite/lib/libffi-dg.exp: Set LD_LIBRARY_PATH_64 for
diff --git a/libffi/include/ffi_mips.h b/libffi/include/ffi_mips.h
index 6fd56474f06..c54224c4bba 100644
--- a/libffi/include/ffi_mips.h
+++ b/libffi/include/ffi_mips.h
@@ -30,17 +30,13 @@
 #if !defined(_MIPS_SIM)
 -- something is very wrong --
 #else
-#  if _MIPS_SIM==_ABIN32 && defined(_ABIN32)
+#  if (_MIPS_SIM==_ABIN32 && defined(_ABIN32)) || (_MIPS_SIM==_ABI64 && defined(_ABI64))
 #    define FFI_MIPS_N32
 #  else
-#    if defined(__GNUC__)
+#    if _MIPS_SIM==_ABIO32 && defined(_ABIO32)
 #      define FFI_MIPS_O32
 #    else
-#      if _MIPS_SIM==_ABIO32
-#        define FFI_MIPS_O32
-#      else
 -- this is an unsupported platform --
-#      endif
 #    endif
 #  endif
 #endif