diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index cfb7a2ff4ba8..76fb1d4fbf03 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-27  Mikael Pettersson  <mikpe@it.uu.se>
+
+	PR libffi/52223
+	* Makefile.am (FLAGS_TO_PASS): Define.
+	* Makefile.in: Regenerate.
+
 2012-02-23  Kai Tietz  <ktietz@redhat.com>
 
 	PR libffi/52221
diff --git a/libffi/Makefile.am b/libffi/Makefile.am
index ccbefe64da6a..23e002e96454 100644
--- a/libffi/Makefile.am
+++ b/libffi/Makefile.am
@@ -76,6 +76,9 @@ AM_MAKEFLAGS = \
 	"RANLIB=$(RANLIB)" \
 	"DESTDIR=$(DESTDIR)"
 
+# Subdir rules rely on $(FLAGS_TO_PASS)
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
+
 MAKEOVERRIDES=
 
 toolexeclib_LTLIBRARIES = libffi.la
diff --git a/libffi/Makefile.in b/libffi/Makefile.in
index 3ac6d29b877f..74ee53701318 100644
--- a/libffi/Makefile.in
+++ b/libffi/Makefile.in
@@ -455,6 +455,9 @@ AM_MAKEFLAGS = \
 	"RANLIB=$(RANLIB)" \
 	"DESTDIR=$(DESTDIR)"
 
+
+# Subdir rules rely on $(FLAGS_TO_PASS)
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 MAKEOVERRIDES = 
 toolexeclib_LTLIBRARIES = libffi.la
 noinst_LTLIBRARIES = libffi_convenience.la