diff --git a/ChangeLog b/ChangeLog
index 88a3f7c42..36c1f1f6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-24  Adam Fedor  <fedor@gnu.org>
+
+	* configure.ac: Don't fail if ffcall trampolines don't work.
+	* configure: regnerate.
+
 2007-12-24  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSRunLoop.m: Perhaps a bit paranoid, but alter to recheck
diff --git a/configure b/configure
index ecb3a1450..520226ac9 100755
--- a/configure
+++ b/configure
@@ -16238,9 +16238,10 @@ 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
+  # Don't enforce this. Sometimes things work fine anyway...
+  #if test $have_working_trampoline = no; then
+  #  ffi_ok=no
+  #fi
 fi
 
 if test $ffi_ok = no; then
diff --git a/configure.ac b/configure.ac
index 947b493b9..1aa15cdc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1911,9 +1911,10 @@ if test $enable_ffcall = yes -a $ffi_ok = 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
 fi
 
 if test $ffi_ok = no; then