diff --git a/ChangeLog b/ChangeLog
index 84ca02bfb6e36625b3e75eadcee16496ded68f4e..1221651e31a98b32357ffba0358bac2c01e3f8bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-01  Andreas Tobler  <andreast@gcc.gnu.org>
+
+	PR libffi/65726
+	* Makefile.def (lang_env_dependencies): Make libffi depend
+	on cxx.
+	* Makefile.in: Regenerate.
+
 2015-11-26  David Edelsohn  <dje.gcc@gmail.com>
 
 	* m4/libtool.m4 (export_symbols_cmds) [AIX]: Add global TLS "L"
diff --git a/Makefile.def b/Makefile.def
index 8b4dad99160e187dea10abef5ac07ea7342a680b..35829801391ebe8019325e46f18ce13655a5224a 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -534,6 +534,7 @@ dependencies = { module=all-m4; on=all-build-texinfo; };
 // on libgcc and newlib/libgloss.
 lang_env_dependencies = { module=libjava; cxx=true; };
 lang_env_dependencies = { module=libitm; cxx=true; };
+lang_env_dependencies = { module=libffi; cxx=true; };
 lang_env_dependencies = { module=libcilkrts; cxx=true; };
 lang_env_dependencies = { module=liboffloadmic; cxx=true; };
 lang_env_dependencies = { module=newlib; no_c=true; };
diff --git a/Makefile.in b/Makefile.in
index 75caafd1595596b0ef70422f048e3ee941fa86ec..66817b34a705a23751c1c8a234297c71c4f9f0cf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51034,6 +51034,7 @@ configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss
 
 
 configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-libffi: maybe-all-target-libstdc++-v3
 
 configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss
 configure-target-libjava: maybe-all-target-libstdc++-v3