diff --git a/gst/Makefile.am b/gst/Makefile.am
index 514cdb88b4..426d4fcb0f 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -125,6 +125,16 @@ cothreads.o: $(srcdir)/cothreads.c $(srcdir)/cothreads.h $(srcdir)/gst_private.h
 
 ##### end immense suckage #####
 
+##### Other built sources #####
+
+gstmarshal.h: gstmarshal.list
+	glib-genmarshal --header --prefix=gst gstmarshal.list > gstmarshal.h
+
+gstmarshal.c: gstmarshal.list
+	glib-genmarshal --body --prefix=gst gstmarshal.list > gstmarshal.c
+
+##### end built sources #####
+
 
 libgstincludedir = $(includedir)/gst
 libgstinclude_HEADERS =		\
diff --git a/gst/gstmarshal.c b/gst/gstmarshal.c
deleted file mode 100644
index c17898ef8b..0000000000
--- a/gst/gstmarshal.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include <glib-object.h>
-
-/* VOID:OBJECT,POINTER (gstmarshal.list:1) */
-void
-gst_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
-                                  GValue       *return_value,
-                                  guint         n_param_values,
-                                  const GValue *param_values,
-                                  gpointer      invocation_hint,
-                                  gpointer      marshal_data)
-{
-  typedef void (*GMarshalFunc_VOID__OBJECT_POINTER) (gpointer     data1,
-                                                     gpointer     arg_1,
-                                                     gpointer     arg_2,
-                                                     gpointer     data2);
-  register GMarshalFunc_VOID__OBJECT_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_VOID__OBJECT_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  callback (data1,
-            g_value_get_object (param_values + 1),
-            g_value_get_pointer (param_values + 2),
-            data2);
-}
-
-/* VOID:INT,INT (gstmarshal.list:2) */
-void
-gst_marshal_VOID__INT_INT (GClosure     *closure,
-                           GValue       *return_value,
-                           guint         n_param_values,
-                           const GValue *param_values,
-                           gpointer      invocation_hint,
-                           gpointer      marshal_data)
-{
-  typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer     data1,
-                                              gint         arg_1,
-                                              gint         arg_2,
-                                              gpointer     data2);
-  register GMarshalFunc_VOID__INT_INT callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
-
-  callback (data1,
-            g_value_get_int (param_values + 1),
-            g_value_get_int (param_values + 2),
-            data2);
-}
-
diff --git a/gst/gstmarshal.h b/gst/gstmarshal.h
deleted file mode 100644
index e74c90387e..0000000000
--- a/gst/gstmarshal.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* VOID:OBJECT,POINTER (gstmarshal.list:1) */
-extern void gst_marshal_VOID__OBJECT_POINTER (GClosure     *closure,
-                                              GValue       *return_value,
-                                              guint         n_param_values,
-                                              const GValue *param_values,
-                                              gpointer      invocation_hint,
-                                              gpointer      marshal_data);
-
-/* VOID:INT,INT (gstmarshal.list:2) */
-extern void gst_marshal_VOID__INT_INT (GClosure     *closure,
-                                       GValue       *return_value,
-                                       guint         n_param_values,
-                                       const GValue *param_values,
-                                       gpointer      invocation_hint,
-                                       gpointer      marshal_data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
diff --git a/gst/gstmarshal.list b/gst/gstmarshal.list
new file mode 100644
index 0000000000..651b2c6f62
--- /dev/null
+++ b/gst/gstmarshal.list
@@ -0,0 +1,2 @@
+VOID:OBJECT,POINTER
+VOID:INT,INT