diff --git a/ChangeLog b/ChangeLog
index 9e5d84b24..61558d065 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-10  Adam Fedor  <fedor@gnu.org>
+
+	* configure.ac: Enable libffi on darwin by default.
+
 2002-12-10  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSArray.m: ([removeObjectsFromIndices:numIndices:])
diff --git a/Documentation/install.texi b/Documentation/install.texi
index 88f23412d..db463c9b7 100644
--- a/Documentation/install.texi
+++ b/Documentation/install.texi
@@ -122,9 +122,18 @@ library). You can get this library from
 Support for the libffi library has also been added, although it is not
 as well tested as ffcall. Current versions of libffi are only
 distributed with gcc version 3.x, although it is not installed by
-default. To install it, after you have built gcc, go to the libffi
-build directory and type 'make install'. To enable this in the
-gnustep-base library, use the configure option @code{--enable-libffi}.
+default. To install it, after you have built gcc, do something like:
+@example
+mkdir newlibffi
+cd newlibffi
+../gcc-3.2.1/libffi/configure
+make
+ffitest
+sudo make install
+@end example
+
+ To enable this in the gnustep-base library, use the configure option
+@code{--enable-libffi}.
 
 @node OpenSSL,  , FFI Library, Configuration
 @subsection OpenSSL
diff --git a/configure b/configure
index 50f58801f..678fe8528 100755
--- a/configure
+++ b/configure
@@ -11009,12 +11009,18 @@ echo "${ECHO_T}$enable_fake_main" >&6
 # Check for FFI interface libraries for invocations
 # We enable ffcall by default now.
 #--------------------------------------------------------------------
+do_enable_libffi=no
+# Enable libffi by default on the following machines
+case "$target_os" in
+    darwin*)	do_enable_libffi=yes;;
+esac
+
 # Check whether --enable-libffi or --disable-libffi was given.
 if test "${enable_libffi+set}" = set; then
   enableval="$enable_libffi"
 
 else
-  enable_libffi=no
+  enable_libffi=$do_enable_libffi
 fi;
 
 # Check whether --enable-ffcall or --disable-ffcall was given.
diff --git a/configure.ac b/configure.ac
index 80024e1dd..c23e8948c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -844,9 +844,15 @@ AC_MSG_RESULT($enable_fake_main)
 # Check for FFI interface libraries for invocations
 # We enable ffcall by default now.
 #--------------------------------------------------------------------
+do_enable_libffi=no
+# Enable libffi by default on the following machines
+case "$target_os" in
+    darwin*)	do_enable_libffi=yes;;
+esac
+
 AC_ARG_ENABLE(libffi,
   [  --enable-libffi  		Enable use of libffi library],,
-  enable_libffi=no)
+  enable_libffi=$do_enable_libffi)
 
 AC_ARG_ENABLE(ffcall,
   [  --enable-ffcall  		Enable use of ffcall library],,