diff --git a/.gitignore b/.gitignore
index a2490ed8..6e8309e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,6 +74,3 @@ Debug*
 data/org.gnome.calendar.enums.xml
 src/gcal-enum-types.c
 src/gcal-enum-types.h
-src/gcal-marshalers.c
-src/gcal-marshalers.h
-src/stamp-gcal-marshalers.h
diff --git a/configure.ac b/configure.ac
index 962cb256..c1f86537 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,6 @@ GLIB_GSETTINGS
 dnl ================================================================
 dnl Misc
 dnl ================================================================
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 
 GNOME_COMMON_INIT
diff --git a/src/Makefile.am b/src/Makefile.am
index d4cc577c..21ac81f3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,8 +15,6 @@ AM_CFLAGS =                                               \
 bin_PROGRAMS = gnome-calendar
 
 BUILT_SOURCES =                                           \
-    gcal-marshalers.c                                     \
-    gcal-marshalers.h                                     \
     gcal-enum-types.c                                     \
     gcal-enum-types.h
 
@@ -63,56 +61,19 @@ gnome_calendar_LDADD =                                    \
 ENUM_TYPES =                                              \
     gcal-utils.h
 
-if MAINTAINER_MODE
-
-CLEANFILES = \
-	$(BUILT_SOURCES) \
-	stamp-gcal-marshalers.h \
-	xgen-ac \
-	xgen-ah \
-	xgen-etbc \
-	xgen-etbh \
-	xgen-tmc \
-	xgen-tmh \
-	$(NULL)
-
 gcal-enum-types.h: gcal-enum-types.h.template $(ENUM_TYPES) $(GLIB_MKENUMS)
 	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gcal-enum-types.h.template $(ENUM_TYPES)) > $@
 
 gcal-enum-types.c: gcal-enum-types.c.template $(ENUM_TYPES) $(GLIB_MKENUMS)
 	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template gcal-enum-types.c.template $(ENUM_TYPES)) > $@
 
-gcal-marshalers.h: stamp-gcal-marshalers.h
-	@true
-
-stamp-gcal-marshalers.h: gcal-marshalers.list Makefile
-	$(AM_V_GEN) ( \
-		cd $(srcdir) \
-		&& ( glib-genmarshal \
-			--prefix=_gcal_marshal \
-			--header gcal-marshalers.list ) >> xgen-tmh \
-		&& ( cmp -s xgen-tmh gcal-marshalers.h || cp xgen-tmh gcal-marshalers.h ) \
-		&& rm -f xgen-tmh \
-		&& echo timestamp > $(@F) \
-	)
-
-gcal-marshalers.c: gcal-marshalers.list gcal-marshalers.h Makefile
-	$(AM_V_GEN) ( \
-		cd $(srcdir) \
-		&& echo "#include \"gcal-marshalers.h\"" > xgen-tmc \
-		&& ( glib-genmarshal \
-			--prefix=_gcal_marshal \
-			--body gcal-marshalers.list ) >> xgen-tmc \
-		&& cp xgen-tmc gcal-marshalers.c \
-		&& rm -f xgen-tmc \
-	)
-
-endif
+CLEANFILES = \
+	$(BUILT_SOURCES) \
+	$(NULL)
 
 EXTRA_DIST =                                              \
     gcal-enum-types.h.template                            \
-    gcal-enum-types.c.template                            \
-    gcal-marshalers.list
+    gcal-enum-types.c.template
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/src/gcal-marshalers.list b/src/gcal-marshalers.list
deleted file mode 100644
index 05264bd7..00000000
--- a/src/gcal-marshalers.list
+++ /dev/null
@@ -1,3 +0,0 @@
-VOID:POINTER,POINTER,DOUBLE,DOUBLE
-VOID:POINTER,POINTER
-VOID:POINTER,BOOLEAN