diff --git a/ChangeLog b/ChangeLog
index 55aa578c18..dab6f8afe4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2007-10-01  Dan Williams  <dcbw@redhat.com>
+
+	* configure.in
+	  src/marshallers/Makefile.am
+	  src/marshallers/nm-marshal.list
+	  src/marshallers/nm-marshal-main.c
+		- Consolidate glib marshallers into one place
+
+	* src/dhcp-manager/Makefile.am
+	  src/dhcp-manager/nm-dhcp-manager.c
+	  src/supplicant-manager/Makefile.am
+	  src/supplicant-manager/nm-supplicant-manager.c
+	  src/supplicant-manager/nm-supplicant-interface.c
+	  src/ppp-manager/Makefile.am
+	  src/ppp-manager/nm-ppp-manager.c
+	  src/vpn-manager/Makefile.am
+	  src/vpn-manager/nm-vpn-connection.c
+	  src/Makefile.am
+		- Use consolidated marshallers
+
+	* src/dhcp-manager/nm-dhcp-marshal.list
+	  src/dhcp-manager/nm-dhcp-marshal-main.c
+	  src/supplicant-manager/nm-supplicant-marshal-main.c
+	  src/supplicant-manager/nm-supplicant-marshal.list
+	  src/nm-marshal-main.c
+	  src/nm-marshal.list
+	  src/ppp-manager/nm-ppp-marshal-main.c
+	  src/ppp-manager/nm-ppp-marshal.list
+	  src/vpn-manager/nm-vpn-marshal-main.c
+	  src/vpn-manager/nm-vpn-marshal.list
+		- Remove
+
 2007-10-01  Dan Williams  <dcbw@redhat.com>
 
 	* include/NetworkManagerVPN.h
diff --git a/configure.in b/configure.in
index 922f776eac..b4d33e9dfd 100644
--- a/configure.in
+++ b/configure.in
@@ -237,6 +237,7 @@ AC_OUTPUT([
 Makefile
 include/Makefile
 src/Makefile
+src/marshallers/Makefile
 src/named-manager/Makefile
 src/vpn-manager/Makefile
 src/dhcp-manager/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index bd8cf51aab..ea11835fd9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,15 @@
-SUBDIRS=named-manager vpn-manager dhcp-manager supplicant-manager ppp-manager backends
+SUBDIRS= \
+	marshallers \
+	named-manager \
+	vpn-manager \
+	dhcp-manager \
+	supplicant-manager \
+	ppp-manager \
+	backends
 
 INCLUDES = -I${top_srcdir}                   \
            -I${top_srcdir}/include           \
+           -I${top_builddir}/src/marshallers   \
            -I${top_srcdir}/src/named-manager \
            -I${top_srcdir}/src/vpn-manager   \
            -I${top_srcdir}/src/dhcp-manager  \
@@ -50,27 +58,12 @@ NetworkManager_SOURCES =				\
 		nm-activation-request.h		\
 		autoip.c					\
 		autoip.h					\
-		nm-marshal-main.c		\
 		kernel-types.h			\
 		wpa.c				\
 		wpa.h				\
 		nm-netlink.c			\
 		nm-netlink.h
 
-nm-marshal.h: Makefile.am nm-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --header > \
-		xgen-gmh \
-	&& (cmp -s xgen-gmh nm-marshal.h || cp xgen-gmh nm-marshal.h) \
-	&& rm -f xgen-gmh xgen-gmh~
-
-nm-marshal.c: Makefile.am nm-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --body > \
-		xgen-gmc \
-	&& cp xgen-gmc nm-marshal.c \
-	&& rm -f xgen-gmc xgen-gmc~
-
-nm-marshal-main.c: nm-marshal.c nm-marshal.h
-
 nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
 	dbus-binding-tool --prefix=nm_access_point --mode=glib-server --output=nm-access-point-glue.h $(top_srcdir)/introspection/nm-access-point.xml
 
@@ -91,8 +84,6 @@ nm-ip4-config-glue.h: $(top_srcdir)/introspection/nm-ip4-config.xml
 
 
 built_sources = 					\
-	nm-marshal.h					\
-	nm-marshal.c					\
 	nm-access-point-glue.h				\
 	nm-manager-glue.h				\
 	nm-device-interface-glue.h			\
@@ -127,6 +118,7 @@ NetworkManager_LDADD = 							\
 			$(HAL_LIBS)						\
 			$(IWLIB)							\
 			$(LIBNL_LIBS)						\
+			./marshallers/libmarshallers.la	\
 			./named-manager/libnamed-manager.la	\
 			./vpn-manager/libvpn-manager.la		\
 			./dhcp-manager/libdhcp-manager.la		\
@@ -157,8 +149,7 @@ dbusservice_DATA = NetworkManager.conf
 
 EXTRA_DIST = \
 	$(dbusservice_DATA) \
-	$(NetworkManager_DATA) \
-	nm-marshal.list
+	$(NetworkManager_DATA)
 
 rundir=$(localstatedir)/run/NetworkManager
 dispatcherdir=$(sysconfdir)/NetworkManager/dispatcher.d
diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index e1095053a3..1f3b6b2dd5 100644
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -1,50 +1,36 @@
-INCLUDES = -I${top_srcdir}                       \
-           -I${top_srcdir}/include               \
-           -I${top_srcdir}/libnm-util            \
-           -I${top_srcdir}/src                   \
-           -I${top_srcdir}/src/named-manager
+INCLUDES = \
+	-I${top_srcdir} \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/src/marshallers \
+	-I${top_srcdir}/libnm-util \
+	-I${top_srcdir}/src \
+	-I${top_srcdir}/src/named-manager
 
 noinst_LTLIBRARIES = libdhcp-manager.la
 
-BUILT_SOURCES = \
-	nm-dhcp-marshal.h \
-	nm-dhcp-marshal.c
-
 libdhcp_manager_la_SOURCES = \
 	nm-dhcp-manager.c \
-	nm-dhcp-manager.h \
-	nm-dhcp-marshal-main.c
+	nm-dhcp-manager.h
 
-libdhcp_manager_la_CPPFLAGS =	$(DBUS_CFLAGS)					\
-						$(GTHREAD_CFLAGS)				\
-						$(HAL_CFLAGS)					\
-						-g							\
-						-Wall						\
-						-DDBUS_API_SUBJECT_TO_CHANGE		\
-						-DG_DISABLE_DEPRECATED			\
-						-DBINDIR=\"$(bindir)\"			\
-						-DDATADIR=\"$(datadir)\"			\
-						-DSYSCONFDIR=\"$(sysconfdir)\"	\
-						-DLIBEXECDIR=\"$(libexecdir)\"	\
-						-DLOCALSTATEDIR=\"$(localstatedir)\"
+libdhcp_manager_la_CPPFLAGS = \
+	$(DBUS_CFLAGS) \
+	$(GTHREAD_CFLAGS) \
+	$(HAL_CFLAGS) \
+	-g \
+	-Wall \
+	-DDBUS_API_SUBJECT_TO_CHANGE \
+	-DG_DISABLE_DEPRECATED \
+	-DBINDIR=\"$(bindir)\" \
+	-DDATADIR=\"$(datadir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
+	-DLOCALSTATEDIR=\"$(localstatedir)\"
 
 
-libdhcp_manager_la_LIBADD = $(DBUS_LIBS) $(GTHREAD_LIBS)
+libdhcp_manager_la_LIBADD = \
+	$(DBUS_LIBS) \
+	$(GTHREAD_LIBS) \
+	$(top_builddir)/src/marshallers/libmarshallers.la
 
-EXTRA_DIST = nm-dhcp-marshal.list
 CLEANFILES = $(BUILT_SOURCES)
 
-nm-dhcp-marshal.h: nm-dhcp-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_dhcp_marshal $(srcdir)/nm-dhcp-marshal.list --header > \
-		xgen-gmh \
-	&& (cmp -s xgen-gmh nm-dhcp-marshal.h || cp xgen-gmh nm-dhcp-marshal.h) \
-	&& rm -f xgen-gmh xgen-gmh~
-
-nm-dhcp-marshal.c: nm-dhcp-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_dhcp_marshal $(srcdir)/nm-dhcp-marshal.list --body > \
-		xgen-gmc \
-	&& cp xgen-gmc nm-dhcp-marshal.c \
-	&& rm -f xgen-gmc xgen-gmc~
-
-nm-dhcp-marshal-main.c: nm-dhcp-marshal.c nm-dhcp-marshal.h
-
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index 93b3799e4e..aa1eda8714 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -29,7 +29,7 @@
 #include <string.h>
 
 #include "nm-dhcp-manager.h"
-#include "nm-dhcp-marshal.h"
+#include "nm-marshal.h"
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-dbus-manager.h"
@@ -157,7 +157,7 @@ nm_dhcp_manager_class_init (NMDHCPManagerClass *manager_class)
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (NMDHCPManagerClass, state_changed),
 					  NULL, NULL,
-					  nm_dhcp_marshal_VOID__STRING_UCHAR,
+					  nm_marshal_VOID__STRING_UCHAR,
 					  G_TYPE_NONE, 2,
 					  G_TYPE_STRING,
 					  G_TYPE_UCHAR);
diff --git a/src/dhcp-manager/nm-dhcp-marshal-main.c b/src/dhcp-manager/nm-dhcp-marshal-main.c
deleted file mode 100644
index eba68d7ea1..0000000000
--- a/src/dhcp-manager/nm-dhcp-marshal-main.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "nm-dhcp-marshal.h"
-#include "nm-dhcp-marshal.c"
-
diff --git a/src/dhcp-manager/nm-dhcp-marshal.list b/src/dhcp-manager/nm-dhcp-marshal.list
deleted file mode 100644
index 8147399d30..0000000000
--- a/src/dhcp-manager/nm-dhcp-marshal.list
+++ /dev/null
@@ -1,2 +0,0 @@
-VOID:STRING,UCHAR
-
diff --git a/src/marshallers/Makefile.am b/src/marshallers/Makefile.am
new file mode 100644
index 0000000000..e877f17920
--- /dev/null
+++ b/src/marshallers/Makefile.am
@@ -0,0 +1,35 @@
+noinst_LTLIBRARIES = libmarshallers.la
+
+BUILT_SOURCES = \
+	nm-marshal.h \
+	nm-marshal.c
+
+libmarshallers_la_SOURCES = \
+	nm-marshal-main.c
+
+libmarshallers_la_CPPFLAGS = \
+	$(GTHREAD_CFLAGS) \
+	-g \
+	-Wall \
+	-DG_DISABLE_DEPRECATED
+
+
+libmarshallers_la_LIBADD = $(GTHREAD_LIBS)
+
+EXTRA_DIST = nm-marshal.list
+CLEANFILES = $(BUILT_SOURCES)
+
+nm-marshal.h: nm-marshal.list
+	$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --header > \
+		xgen-gmh \
+	&& (cmp -s xgen-gmh nm-marshal.h || cp xgen-gmh nm-marshal.h) \
+	&& rm -f xgen-gmh xgen-gmh~
+
+nm-marshal.c: nm-marshal.list
+	$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --body > \
+		xgen-gmc \
+	&& cp xgen-gmc nm-marshal.c \
+	&& rm -f xgen-gmc xgen-gmc~
+
+nm-marshal-main.c: nm-marshal.c nm-marshal.h
+
diff --git a/src/nm-marshal-main.c b/src/marshallers/nm-marshal-main.c
similarity index 100%
rename from src/nm-marshal-main.c
rename to src/marshallers/nm-marshal-main.c
diff --git a/src/nm-marshal.list b/src/marshallers/nm-marshal.list
similarity index 64%
rename from src/nm-marshal.list
rename to src/marshallers/nm-marshal.list
index 850295388f..716b0eb0b9 100644
--- a/src/nm-marshal.list
+++ b/src/marshallers/nm-marshal.list
@@ -4,3 +4,6 @@ VOID:OBJECT,UINT
 VOID:POINTER
 VOID:STRING,STRING,STRING
 VOID:UINT,UINT
+VOID:STRING,STRING
+VOID:STRING,UCHAR
+VOID:STRING,OBJECT
diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index 6426b97690..cedab2a2a9 100644
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -1,19 +1,16 @@
-INCLUDES = -I${top_srcdir}                       \
-	-I${top_srcdir}/include               \
-	-I${top_srcdir}/libnm-util            \
-	-I${top_srcdir}/src
+INCLUDES = \
+	-I${top_srcdir} \
+	-I${top_srcdir}/include \
+	-I${top_srcdir}/libnm-util \
+	-I${top_srcdir}/src \
+	-I${top_builddir}/src/marshallers
 
 noinst_LTLIBRARIES = libppp-manager.la
 
-BUILT_SOURCES = \
-	nm-ppp-marshal.h \
-	nm-ppp-marshal.c
-
 libppp_manager_la_SOURCES = \
 	nm-ppp-manager.c \
 	nm-ppp-manager.h \
-	nm-ppp-status.h  \
-	nm-ppp-marshal-main.c
+	nm-ppp-status.h
 
 libppp_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS)					\
@@ -22,7 +19,10 @@ libppp_manager_la_CPPFLAGS = \
 	-DSYSCONFDIR=\"$(sysconfdir)\"  \
 	-DLIBDIR=\"$(libdir)\"
 
-libppp_manager_la_LIBADD = $(DBUS_LIBS) $(GLIB_LIBS)
+libppp_manager_la_LIBADD = \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS) \
+	$(top_builddir)/src/marshallers/libmarshallers.la
 
 nm_pppd_plugindir = $(libdir)
 nm_pppd_plugin_PROGRAMS = nm-pppd-plugin.so
@@ -40,22 +40,5 @@ nm_pppd_plugin_so_LDADD = \
 	$(GLIB_LIBS) \
 	$(top_builddir)/libnm-util/libnm-util.la
 
-
-
-EXTRA_DIST = nm-ppp-marshal.list
 CLEANFILES = $(BUILT_SOURCES)
 
-nm-ppp-marshal.h: nm-ppp-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_ppp_marshal $(srcdir)/nm-ppp-marshal.list --header > \
-		xgen-gmh \
-	&& (cmp -s xgen-gmh nm-ppp-marshal.h || cp xgen-gmh nm-ppp-marshal.h) \
-	&& rm -f xgen-gmh xgen-gmh~
-
-nm-ppp-marshal.c: nm-ppp-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_ppp_marshal $(srcdir)/nm-ppp-marshal.list --body > \
-		xgen-gmc \
-	&& cp xgen-gmc nm-ppp-marshal.c \
-	&& rm -f xgen-gmc xgen-gmc~
-
-nm-ppp-marshal-main.c: nm-ppp-marshal.c nm-ppp-marshal.h
-
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index 351ae1cae6..11435f1e76 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -10,7 +10,7 @@
 #include "nm-dbus-manager.h"
 #include "nm-utils.h"
 #include "dbus-dict-helpers.h"
-#include "nm-ppp-marshal.h"
+#include "nm-marshal.h"
 
 #define NM_PPPD_PLUGIN LIBDIR "/nm-pppd-plugin.so"
 #define NM_PPP_WAIT_PPPD 10000 /* 10 seconds */
@@ -87,7 +87,7 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class)
 				    G_SIGNAL_RUN_FIRST,
 				    G_STRUCT_OFFSET (NMPPPManagerClass, ip4_config),
 				    NULL, NULL,
-				    nm_ppp_marshal_VOID__STRING_OBJECT,
+				    nm_marshal_VOID__STRING_OBJECT,
 				    G_TYPE_NONE, 2,
 				    G_TYPE_STRING,
 				    G_TYPE_OBJECT);
diff --git a/src/ppp-manager/nm-ppp-marshal-main.c b/src/ppp-manager/nm-ppp-marshal-main.c
deleted file mode 100644
index 14bfd9860f..0000000000
--- a/src/ppp-manager/nm-ppp-marshal-main.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "nm-ppp-marshal.h"
-#include "nm-ppp-marshal.c"
-
diff --git a/src/ppp-manager/nm-ppp-marshal.list b/src/ppp-manager/nm-ppp-marshal.list
deleted file mode 100644
index 7e665999e8..0000000000
--- a/src/ppp-manager/nm-ppp-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-VOID:STRING,OBJECT
diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am
index 8b279368c3..ec94578519 100644
--- a/src/supplicant-manager/Makefile.am
+++ b/src/supplicant-manager/Makefile.am
@@ -1,14 +1,12 @@
-INCLUDES = -I${top_srcdir}/src \
-           -I${top_srcdir}/include \
-           -I${top_srcdir}/libnm-util \
-           -I${top_srcdir}/src/named-manager
+INCLUDES = \
+	-I${top_srcdir}/src \
+	-I${top_srcdir}/include \
+	-I${top_srcdir}/libnm-util \
+	-I${top_builddir}/src/marshallers \
+	-I${top_srcdir}/src/named-manager
 
 noinst_LTLIBRARIES = libsupplicant-manager.la
 
-BUILT_SOURCES = \
-	nm-supplicant-marshal.h \
-	nm-supplicant-marshal.c
-
 libsupplicant_manager_la_SOURCES = \
 	nm-supplicant-types.h \
 	nm-supplicant-manager.h \
@@ -18,8 +16,7 @@ libsupplicant_manager_la_SOURCES = \
 	nm-supplicant-interface.c \
 	nm-supplicant-interface.h \
 	nm-supplicant-settings-verify.h \
-	nm-supplicant-settings-verify.c \
-	nm-supplicant-marshal-main.c
+	nm-supplicant-settings-verify.c
 
 libsupplicant_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
@@ -31,25 +28,10 @@ libsupplicant_manager_la_CPPFLAGS = \
 
 libsupplicant_manager_la_LIBADD = \
 	$(DBUS_LIBS) \
-	$(GTHREAD_LIBS)
+	$(GTHREAD_LIBS) \
+	$(top_builddir)/src/marshallers/libmarshallers.la
 
 $(libsupplicant_manager_la_OBJECTS): $(BUILT_SOURCES)
 
-EXTRA_DIST = \
-	nm-supplicant-marshal.list
-
 CLEANFILES = $(BUILT_SOURCES)
 
-nm-supplicant-marshal.h: nm-supplicant-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_supplicant_marshal $(srcdir)/nm-supplicant-marshal.list --header > \
-		xgen-gmh \
-	&& (cmp -s xgen-gmh nm-supplicant-marshal.h || cp xgen-gmh nm-supplicant-marshal.h) \
-	&& rm -f xgen-gmh xgen-gmh~
-
-nm-supplicant-marshal.c: nm-supplicant-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_supplicant_marshal $(srcdir)/nm-supplicant-marshal.list --body > \
-		xgen-gmc \
-	&& cp xgen-gmc nm-supplicant-marshal.c \
-	&& rm -f xgen-gmc xgen-gmc~
-
-nm-supplicant-marshal-main.c: nm-supplicant-marshal.c nm-supplicant-marshal.h
diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c
index 0879c9655d..4f0243b4e2 100644
--- a/src/supplicant-manager/nm-supplicant-interface.c
+++ b/src/supplicant-manager/nm-supplicant-interface.c
@@ -26,7 +26,7 @@
 #include "nm-supplicant-interface.h"
 #include "nm-supplicant-manager.h"
 #include "nm-utils.h"
-#include "nm-supplicant-marshal.h"
+#include "nm-marshal.h"
 #include "nm-supplicant-config.h"
 #include "nm-dbus-manager.h"
 #include "dbus-dict-helpers.h"
@@ -408,7 +408,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NMSupplicantInterfaceClass, state),
 		              NULL, NULL,
-		              nm_supplicant_marshal_VOID__UINT_UINT,
+		              nm_marshal_VOID__UINT_UINT,
 		              G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 
 	nm_supplicant_interface_signals[REMOVED] =
@@ -444,7 +444,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NMSupplicantInterfaceClass, connection_state),
 		              NULL, NULL,
-		              nm_supplicant_marshal_VOID__UINT_UINT,
+		              nm_marshal_VOID__UINT_UINT,
 		              G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 
 	nm_supplicant_interface_signals[CONNECTION_ERROR] =
@@ -453,7 +453,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NMSupplicantInterfaceClass, connection_error),
 		              NULL, NULL,
-		              nm_supplicant_marshal_VOID__STRING_STRING,
+		              nm_marshal_VOID__STRING_STRING,
 		              G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 }
 
@@ -716,8 +716,10 @@ nm_supplicant_interface_add_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpoi
 
 		dbus_g_proxy_add_signal (priv->iface_proxy, "ScanResultsAvailable", G_TYPE_INVALID);
 
-		dbus_g_object_register_marshaller (nm_supplicant_marshal_VOID__STRING_STRING,
-										   G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+		dbus_g_object_register_marshaller (nm_marshal_VOID__STRING_STRING,
+										   G_TYPE_NONE,
+										   G_TYPE_STRING, G_TYPE_STRING,
+										   G_TYPE_INVALID);
 
 		dbus_g_proxy_add_signal (priv->iface_proxy, "StateChange", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
 
diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c
index 0c92f15ac8..55b9dd554d 100644
--- a/src/supplicant-manager/nm-supplicant-manager.c
+++ b/src/supplicant-manager/nm-supplicant-manager.c
@@ -26,7 +26,7 @@
 #include "nm-supplicant-manager.h"
 #include "nm-supplicant-interface.h"
 #include "nm-dbus-manager.h"
-#include "nm-supplicant-marshal.h"
+#include "nm-marshal.h"
 #include "nm-utils.h"
 
 #define SUPPLICANT_POKE_INTERVAL 6000
@@ -184,7 +184,7 @@ nm_supplicant_manager_class_init (NMSupplicantManagerClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NMSupplicantManagerClass, state),
 		              NULL, NULL,
-		              nm_supplicant_marshal_VOID__UINT_UINT,
+		              nm_marshal_VOID__UINT_UINT,
 		              G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 }
 
diff --git a/src/supplicant-manager/nm-supplicant-marshal-main.c b/src/supplicant-manager/nm-supplicant-marshal-main.c
deleted file mode 100644
index fb1df97d0a..0000000000
--- a/src/supplicant-manager/nm-supplicant-marshal-main.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "nm-supplicant-marshal.h"
-#include "nm-supplicant-marshal.c"
diff --git a/src/supplicant-manager/nm-supplicant-marshal.list b/src/supplicant-manager/nm-supplicant-marshal.list
deleted file mode 100644
index 72037b273d..0000000000
--- a/src/supplicant-manager/nm-supplicant-marshal.list
+++ /dev/null
@@ -1,2 +0,0 @@
-VOID:UINT,UINT
-VOID:STRING,STRING
diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am
index 509fe585ff..5c4fa6a3f0 100644
--- a/src/vpn-manager/Makefile.am
+++ b/src/vpn-manager/Makefile.am
@@ -1,9 +1,11 @@
-INCLUDES = -I${top_srcdir}                       \
-           -I${top_srcdir}/include               \
-           -I${top_srcdir}/libnm-util            \
-           -I${top_srcdir}/src                   \
-           -I${top_srcdir}/src/named-manager     \
-           -DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"
+INCLUDES = \
+	-I${top_srcdir} \
+	-I${top_srcdir}/include \
+	-I${top_srcdir}/libnm-util \
+	-I${top_srcdir}/src \
+	-I${top_builddir}/src/marshallers \
+	-I${top_srcdir}/src/named-manager \
+	-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"
 
 
 noinst_LTLIBRARIES = libvpn-manager.la
@@ -14,22 +16,7 @@ libvpn_manager_la_SOURCES =	\
 	nm-vpn-service.c	\
 	nm-vpn-service.h	\
 	nm-vpn-connection.c	\
-	nm-vpn-connection.h \
-	nm-vpn-marshal-main.c
-
-nm-vpn-marshal.h: Makefile.am nm-vpn-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_vpn_marshal $(srcdir)/nm-vpn-marshal.list --header > \
-		xgen-gmh \
-	&& (cmp -s xgen-gmh nm-vpn-marshal.h || cp xgen-gmh nm-vpn-marshal.h) \
-	&& rm -f xgen-gmh xgen-gmh~
-
-nm-vpn-marshal.c: Makefile.am nm-vpn-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_vpn_marshal $(srcdir)/nm-vpn-marshal.list --body > \
-		xgen-gmc \
-	&& cp xgen-gmc nm-vpn-marshal.c \
-	&& rm -f xgen-gmc xgen-gmc~
-
-nm-vpn-marshal-main.c: nm-vpn-marshal.c nm-vpn-marshal.h
+	nm-vpn-connection.h
 
 libvpn_manager_la_CPPFLAGS =	\
 	$(DBUS_CFLAGS)		\
@@ -38,6 +25,7 @@ libvpn_manager_la_CPPFLAGS =	\
 libvpn_manager_la_LIBADD =	\
 	$(DBUS_LIBS)		\
 	$(GTHREAD_LIBS)		\
+	$(top_builddir)/src/marshallers/libmarshallers.la \
 	$(top_builddir)/libnm-util/libnm-util.la
 
 nm-vpn-manager-glue.h: $(top_srcdir)/introspection/nm-vpn-manager.xml
@@ -53,13 +41,9 @@ nm-vpn-plugin-bindings.h: $(top_srcdir)/introspection/nm-vpn-plugin.xml
 built_sources = \
 	nm-vpn-manager-glue.h \
 	nm-vpn-connection-glue.h \
-	nm-vpn-plugin-bindings.h \
-	nm-vpn-marshal.h \
-	nm-vpn-marshal.c
+	nm-vpn-plugin-bindings.h
 
 $(libvpn_manager_la_OBJECTS): $(built_sources)
 
 CLEANFILES = $(built_sources)
 
-EXTRA_DIST = nm-vpn-marshal.list
-
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index adc9000e97..f545d24d02 100644
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -35,7 +35,7 @@
 #include "NetworkManagerSystem.h"
 #include "nm-utils.h"
 #include "nm-vpn-plugin-bindings.h"
-#include "nm-vpn-marshal.h"
+#include "nm-marshal.h"
 
 static gboolean impl_vpn_connection_disconnect (NMVPNConnection *connection, GError **err);
 
@@ -847,7 +847,7 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class)
 				    G_SIGNAL_RUN_FIRST,
 				    G_STRUCT_OFFSET (NMVPNConnectionClass, state_changed),
 				    NULL, NULL,
-				    nm_vpn_marshal_VOID__UINT_UINT,
+				    nm_marshal_VOID__UINT_UINT,
 				    G_TYPE_NONE, 2,
 				    G_TYPE_UINT, G_TYPE_UINT);
 
diff --git a/src/vpn-manager/nm-vpn-marshal-main.c b/src/vpn-manager/nm-vpn-marshal-main.c
deleted file mode 100644
index 2f1b13ace6..0000000000
--- a/src/vpn-manager/nm-vpn-marshal-main.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "nm-vpn-marshal.h"
-#include "nm-vpn-marshal.c"
-
diff --git a/src/vpn-manager/nm-vpn-marshal.list b/src/vpn-manager/nm-vpn-marshal.list
deleted file mode 100644
index 6cb743158f..0000000000
--- a/src/vpn-manager/nm-vpn-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-VOID:UINT,UINT