diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am
index cfc34fac3..4e2699876 100644
--- a/build/autotools/Makefile.am
+++ b/build/autotools/Makefile.am
@@ -1,8 +1,6 @@
 NULL =
 
 EXTRA_DIST = \
-	Makefile.am.marshal	\
-	Makefile.am.enums	\
 	introspection.m4	\
 	gtk-doc.m4		\
 	as-compiler-flag.m4	\
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index edfb76285..76ecfba64 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -542,13 +542,13 @@ cally_include_HEADERS = $(cally_sources_h)
 # glib-genmarshal rules
 glib_marshal_list = clutter-marshal.list
 glib_marshal_prefix = _clutter_marshal
-include $(top_srcdir)/build/autotools/Makefile.am.marshal
+include $(srcdir)/Makefile.am.marshal
 
 # glib-mkenums rules
 glib_enum_h = clutter-enum-types.h
 glib_enum_c = clutter-enum-types.c
 glib_enum_headers = $(source_h) $(deprecated_h)
-include $(top_srcdir)/build/autotools/Makefile.am.enums
+include $(srcdir)/Makefile.am.enums
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pc_files)
@@ -674,4 +674,8 @@ gir_DATA = $(INTROSPECTION_GIRS)
 typelibdir = $(mutterlibdir)
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
+EXTRA_DIST += \
+	Makefile.am.marshal	\
+	Makefile.am.enums
+
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
diff --git a/build/autotools/Makefile.am.enums b/clutter/Makefile.am.enums
similarity index 100%
rename from build/autotools/Makefile.am.enums
rename to clutter/Makefile.am.enums
diff --git a/build/autotools/Makefile.am.marshal b/clutter/Makefile.am.marshal
similarity index 100%
rename from build/autotools/Makefile.am.marshal
rename to clutter/Makefile.am.marshal