diff --git a/modules/common.am b/modules/common.am
index 4dd3bb5e87..c766fc1289 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -34,10 +34,3 @@ AM_LDFLAGS = -rpath '$(libvlcdir)' \
 	-shrext $(LIBEXT) \
 	-no-undefined \
 	$(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la
-
-include $(srcdir)/Modules.am
-
-if MAINTAINER_MODE
-$(srcdir)/Makefile.am: $(srcdir)/Modules.am $(top_srcdir)/modules/genmf
-	$(AM_V_GEN)cd \$(top_srcdir) && \$(SHELL) modules/genmf $(dir)
-endif
diff --git a/modules/genmf b/modules/genmf
index 0b9bdb59d0..c6b2bcaca6 100755
--- a/modules/genmf
+++ b/modules/genmf
@@ -45,6 +45,12 @@ libvlc_LTLIBRARIES = ${libvlc_ltlibs}
 EXTRA_LTLIBRARIES = ${extra_ltlibs}
 
 include \$(top_srcdir)/modules/common.am
+include \$(srcdir)/Modules.am
+
+if MAINTAINER_MODE
+\$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/modules/genmf
+	\$(AM_V_GEN)cd \\\$(top_srcdir) && \\\$(SHELL) modules/genmf \$(dir)
+endif
 
 EOF
   for mod in $mods