diff --git a/src/foreign/README b/src/foreign/README
index b80a237190..bb38f13cd8 100644
--- a/src/foreign/README
+++ b/src/foreign/README
@@ -28,6 +28,11 @@ Local changes:
  * Removed +live_support in src/powerpc/darwin_closure.S so it builds
    with Mac OS X 10.3 (r8436)
 
+ * Manually added datarootdir handling in libffi/Makefile.in and
+   libffi/include/Makefile.in to eliminate warnings, change taken from
+   git master source at http://github.com/atgreen/libffi/, tree
+   997968323ed45a5ea5db1ff83124619ae1949bfb. (r18350)
+
 Note: recreating "configure" with autoconf 2.61 does not work as is,
 since the scripts require 2.59.  To allow this, the two requirements
 in "libffi/configure.ac" and "config/override.m4" were temporarily
diff --git a/src/foreign/gcc/libffi/Makefile.in b/src/foreign/gcc/libffi/Makefile.in
index 1b64bf8bf2..41b76d7f7f 100644
--- a/src/foreign/gcc/libffi/Makefile.in
+++ b/src/foreign/gcc/libffi/Makefile.in
@@ -326,6 +326,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
diff --git a/src/foreign/gcc/libffi/include/Makefile.in b/src/foreign/gcc/libffi/include/Makefile.in
index 1f0dc7ee3b..716286787a 100644
--- a/src/foreign/gcc/libffi/include/Makefile.in
+++ b/src/foreign/gcc/libffi/include/Makefile.in
@@ -196,6 +196,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@