diff --git a/src/foreign/README b/src/foreign/README
index a63a9a42c3..98c764beaa 100644
--- a/src/foreign/README
+++ b/src/foreign/README
@@ -17,9 +17,14 @@ ways:
 Local changes:
 
  * Removed libffi/testsuite directory (r8401)
+
  * Removed testsuite mention in configure and make files (r8403)
+
  * Recreated the libffi/configure with autoconf version 2.61 (r8412)
 
+ * Changed config/multi.m4 to allow in-source-tree builds, rebuild
+   libffi/configure (r8413)
+
 ========== libffi_msvc directory =====================================
 
 This directory is synced from the CTypes repository
diff --git a/src/foreign/gcc/config/multi.m4 b/src/foreign/gcc/config/multi.m4
index 98417679f5..12724ef0ac 100644
--- a/src/foreign/gcc/config/multi.m4
+++ b/src/foreign/gcc/config/multi.m4
@@ -27,7 +27,8 @@ AC_ARG_ENABLE(multilib,
 # See config-ml.in if you want the gory details.
 
 if test "$srcdir" = "."; then
-  if test "$with_target_subdir" != "."; then
+  # ELI: modified the following line so builds can happen in the source dir
+  if test ! -z "$with_target_subdir" && test "$with_target_subdir" != "."; then
     multi_basedir="$srcdir/$with_multisrctop../$2"
   else
     multi_basedir="$srcdir/$with_multisrctop$2"
diff --git a/src/foreign/gcc/libffi/configure b/src/foreign/gcc/libffi/configure
index b6ddcf4d88..3b4bae0459 100755
--- a/src/foreign/gcc/libffi/configure
+++ b/src/foreign/gcc/libffi/configure
@@ -2002,7 +2002,8 @@ fi
 # See config-ml.in if you want the gory details.
 
 if test "$srcdir" = "."; then
-  if test "$with_target_subdir" != "."; then
+  # ELI: modified the following line so builds can happen in the source dir
+  if test ! -z "$with_target_subdir" && test "$with_target_subdir" != "."; then
     multi_basedir="$srcdir/$with_multisrctop../.."
   else
     multi_basedir="$srcdir/$with_multisrctop.."
@@ -4642,13 +4643,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4645: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4646: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4648: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4649: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4651: output\"" >&5)
+  (eval echo "\"\$as_me:4652: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5752,7 +5753,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5755 "configure"' > conftest.$ac_ext
+  echo '#line 5756 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6847,11 +6848,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6850: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6851: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6854: \$? = $ac_status" >&5
+   echo "$as_me:6855: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7169,11 +7170,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7172: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7173: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7176: \$? = $ac_status" >&5
+   echo "$as_me:7177: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7274,11 +7275,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7277: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7278: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7281: \$? = $ac_status" >&5
+   echo "$as_me:7282: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7329,11 +7330,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7332: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7333: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7336: \$? = $ac_status" >&5
+   echo "$as_me:7337: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10085,7 +10086,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10088 "configure"
+#line 10089 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10185,7 +10186,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10188 "configure"
+#line 10189 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H