diff --git a/ges/Makefile.am b/ges/Makefile.am
index f247ebaeee..ba7e7d9b5a 100644
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -1,7 +1,11 @@
+built_header_make = gesmarshal.h
+build_source_make = gesmarshal.c
 
 lib_LTLIBRARIES = libges-@GST_MAJORMINOR@.la
 
-CLEANFILES = $(BUILT_SOURCES)
+EXTRA_libges_@GST_MAJORMINOR@_la_SOURCES = gesmarshal.list 
+
+CLEANFILES = $(BUILT_SOURCES) $(built_header_make) $(built_source_make)
 
 libges_@GST_MAJORMINOR@_la_SOURCES = 		\
 	ges.c					\
@@ -34,3 +38,19 @@ libges_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libges_@GST_MAJORMINOR@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) 
 libges_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
+DISTCLEANFILE = $(CLEANFILES)
+
+#files built on make all/check/instal
+BUILT_SOURCES =			\
+	$(built_header_make)	\
+	$(built_source_make)
+
+gesmarshal.h: gesmarshal.list
+	glib-genmarshal --header --prefix=ges_marshal $^ > gesmarshal.h.tmp
+	mv gesmarshal.h.tmp gesmarshal.h
+
+gesmarshal.c: gesmarshal.list
+	echo "#include \"glib-object.h\"" >gesmarshal.c.tmp
+	echo "#include \"gesmarshal.h\"" >> gesmarshal.c.tmp
+	glib-genmarshal --body --prefix=ges_marshal $^ >> gesmarshal.c.tmp
+	mv gesmarshal.c.tmp gesmarshal.c
diff --git a/ges/gesmarshal.list b/ges/gesmarshal.list
new file mode 100644
index 0000000000..e22aea6aa5
--- /dev/null
+++ b/ges/gesmarshal.list
@@ -0,0 +1 @@
+VOID:OBJECT