diff --git a/ChangeLog b/ChangeLog
index a572be1fd..e6f3889c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-24  Adam Fedor  <fedor@gnu.org>
+
+	* configure.ac: Don't fail if ffcall trampolines don't work.
+
 2007-12-11  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSUserDefaults.m: catch exception when unlocking defaults
diff --git a/configure b/configure
index 1aba0faa1..4a20e56ba 100755
--- a/configure
+++ b/configure
@@ -14749,9 +14749,9 @@ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext
 fi
   echo "$as_me:$LINENO: result: $have_working_trampoline" >&5
 echo "${ECHO_T}$have_working_trampoline" >&6
-  if test $have_working_trampoline = no; then
-    ffi_ok=no
-  fi
+  #if test $have_working_trampoline = no; then
+  #  ffi_ok=no
+  #fi
 else
   ffi_ok=no
 fi
diff --git a/configure.ac b/configure.ac
index e0f25e35d..2dd8b237d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1904,9 +1904,10 @@ elif test $enable_ffcall = yes; then
 	  have_working_trampoline=yes, have_working_trampoline=no, 
 	  have_working_trampoline=yes)
   AC_MSG_RESULT($have_working_trampoline)
-  if test $have_working_trampoline = no; then
-    ffi_ok=no
-  fi
+  # Don't enforce this. Sometimes things work fine anyway...
+  #if test $have_working_trampoline = no; then
+  #  ffi_ok=no
+  #fi
 else
   ffi_ok=no
 fi