diff --git a/doc/release-notes/racket/HISTORY.txt b/doc/release-notes/racket/HISTORY.txt
index 5eb9cd0d92..2310bc7ff1 100644
--- a/doc/release-notes/racket/HISTORY.txt
+++ b/doc/release-notes/racket/HISTORY.txt
@@ -2,6 +2,7 @@ Version 5.0.0.9
 Continuation barriers now block only downward continuation jumps
  and allow escapes through full continuations
 Added #:async-apply option to _fun
+Upgraded to libffi 3.0.9+
 
 Version 5.0.0.8
 Changed internal-definition handling to allow expressions mixed
diff --git a/src/configure b/src/configure
index 4b78cfb4a1..0c7027b6b1 100755
--- a/src/configure
+++ b/src/configure
@@ -12250,10 +12250,6 @@ if test -d "${srcdir}/foreign" && test "${enable_foreign}" = "yes" ; then
 
   FOREIGNTARGET="foreign-stuff"
   FOREIGN_IF_USED="FOREIGN_USED"
-  # --disable-multilib is needed to avoid problems when running libffi's
-  # configure script.  This thing affects all usages of AC_CONFIG_SUBDIRS, but
-  # other scripts do not use it anyway.
-  ac_configure_args="$ac_configure_args --disable-multilib"
 else
   FOREIGNTARGET="foreign-stub"
   MZOPTIONS="$MZOPTIONS -DDONT_USE_FOREIGN"
diff --git a/src/foreign/README b/src/foreign/README
index 9e34300602..6e1a9b6afb 100644
--- a/src/foreign/README
+++ b/src/foreign/README
@@ -14,7 +14,8 @@ ways at git commit 3f5b1375ab1e2b8e3d59 from
 
 Local changes:
 
- * cast ftruncate() result in "closures.c" to avoid warning.
+ * Test ftruncate() result in "closures.c" to avoid a compiler
+   warning.
 
 ========== libffi_msvc directory =====================================
 
diff --git a/src/foreign/libffi/src/closures.c b/src/foreign/libffi/src/closures.c
index 77530eb555..1750a49409 100644
--- a/src/foreign/libffi/src/closures.c
+++ b/src/foreign/libffi/src/closures.c
@@ -413,7 +413,8 @@ dlmmap_locked (void *start, size_t length, int prot, int flags, off_t offset)
 	  close (execfd);
 	  goto retry_open;
 	}
-      (void)ftruncate (execfd, offset);
+      if (ftruncate (execfd, offset)) { /* test avoids a compiler warning */
+      }
       return MFAIL;
     }
   else if (!offset
@@ -425,7 +426,8 @@ dlmmap_locked (void *start, size_t length, int prot, int flags, off_t offset)
   if (start == MFAIL)
     {
       munmap (ptr, length);
-      (void)ftruncate (execfd, offset);
+      if (ftruncate (execfd, offset)) {  /* test avoids a compiler warning */
+      }
       return start;
     }
 
diff --git a/src/racket/configure.ac b/src/racket/configure.ac
index e172099073..fa84aedf6b 100644
--- a/src/racket/configure.ac
+++ b/src/racket/configure.ac
@@ -1586,10 +1586,6 @@ if test -d "${srcdir}/foreign" && test "${enable_foreign}" = "yes" ; then
   AC_CONFIG_SUBDIRS( foreign/libffi )
   FOREIGNTARGET="foreign-stuff"
   FOREIGN_IF_USED="FOREIGN_USED"
-  # --disable-multilib is needed to avoid problems when running libffi's
-  # configure script.  This thing affects all usages of AC_CONFIG_SUBDIRS, but
-  # other scripts do not use it anyway.
-  ac_configure_args="$ac_configure_args --disable-multilib"
 else
   FOREIGNTARGET="foreign-stub"
   MZOPTIONS="$MZOPTIONS -DDONT_USE_FOREIGN"