diff --git a/.gitignore b/.gitignore
index 15af4c423b..aa1d5b416f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,12 +117,12 @@ docs/api/NetworkManager.prerequisites
 docs/api/NetworkManager.signals
 docs/api/NetworkManager.types
 
-examples/C/add-connection-dbus-glib
-examples/C/add-connection-libnm-glib
-examples/C/get-active-connections-dbus-glib
-examples/C/get-ap-info-libnm-glib
-examples/C/list-connections-dbus-glib
-examples/C/list-connections-libnm-glib
+examples/C/glib/add-connection-dbus-glib
+examples/C/glib/add-connection-libnm-glib
+examples/C/glib/get-active-connections-dbus-glib
+examples/C/glib/get-ap-info-libnm-glib
+examples/C/glib/list-connections-dbus-glib
+examples/C/glib/list-connections-libnm-glib
 
 callouts/nm-dhcp-client.action
 callouts/nm-avahi-autoipd.action
diff --git a/configure.ac b/configure.ac
index e0af6305df..edeaa79497 100644
--- a/configure.ac
+++ b/configure.ac
@@ -657,6 +657,7 @@ NetworkManager.pc
 examples/Makefile
 examples/python/Makefile
 examples/C/Makefile
+examples/C/glib/Makefile
 ])
 AC_OUTPUT
 
diff --git a/examples/C/Makefile.am b/examples/C/Makefile.am
index 1063d52008..305121195a 100644
--- a/examples/C/Makefile.am
+++ b/examples/C/Makefile.am
@@ -1,63 +1,2 @@
-INCLUDES = -I${top_srcdir}/libnm-util         \
-           -I${top_srcdir}/libnm-glib         \
-           -I${top_srcdir}/include
-
-AM_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS)
-
-noinst_PROGRAMS = \
-	add-connection-dbus-glib \
-	add-connection-libnm-glib \
-	get-active-connections-dbus-glib \
-	list-connections-dbus-glib \
-	list-connections-libnm-glib \
-	get-ap-info-libnm-glib
-
-add_connection_dbus_glib_SOURCES = add-connection-dbus-glib.c
-add_connection_dbus_glib_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS)
-
-add_connection_libnm_glib_SOURCES = add-connection-libnm-glib.c
-add_connection_libnm_glib_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS)
-
-get_active_connections_dbus_glib_SOURCES = get-active-connections-dbus-glib.c
-get_active_connections_dbus_glib_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS)
-
-list_connections_dbus_glib_SOURCES = list-connections-dbus-glib.c
-list_connections_dbus_glib_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS)
-
-list_connections_libnm_glib_SOURCES = list-connections-libnm-glib.c
-list_connections_libnm_glib_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS)
-
-get_ap_info_libnm_glib_SOURCES = get-ap-info-libnm-glib.c
-get_ap_info_libnm_glib_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS)
-
-EXTRA_DIST = \
-	add-connection-dbus-glib.c \
-	add-connection-libnm-glib.c \
-	get-active-connections-dbus-glib.c \
-	list-connections-dbus-glib.c \
-	list-connections-libnm-glib.c \
-	get-ap-info-libnm-glib.c
+SUBDIRS= glib
 
diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am
new file mode 100644
index 0000000000..1063d52008
--- /dev/null
+++ b/examples/C/glib/Makefile.am
@@ -0,0 +1,63 @@
+INCLUDES = -I${top_srcdir}/libnm-util         \
+           -I${top_srcdir}/libnm-glib         \
+           -I${top_srcdir}/include
+
+AM_CPPFLAGS = \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS)
+
+noinst_PROGRAMS = \
+	add-connection-dbus-glib \
+	add-connection-libnm-glib \
+	get-active-connections-dbus-glib \
+	list-connections-dbus-glib \
+	list-connections-libnm-glib \
+	get-ap-info-libnm-glib
+
+add_connection_dbus_glib_SOURCES = add-connection-dbus-glib.c
+add_connection_dbus_glib_LDADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS)
+
+add_connection_libnm_glib_SOURCES = add-connection-libnm-glib.c
+add_connection_libnm_glib_LDADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(top_builddir)/libnm-glib/libnm-glib.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS)
+
+get_active_connections_dbus_glib_SOURCES = get-active-connections-dbus-glib.c
+get_active_connections_dbus_glib_LDADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS)
+
+list_connections_dbus_glib_SOURCES = list-connections-dbus-glib.c
+list_connections_dbus_glib_LDADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS)
+
+list_connections_libnm_glib_SOURCES = list-connections-libnm-glib.c
+list_connections_libnm_glib_LDADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(top_builddir)/libnm-glib/libnm-glib.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS)
+
+get_ap_info_libnm_glib_SOURCES = get-ap-info-libnm-glib.c
+get_ap_info_libnm_glib_LDADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(top_builddir)/libnm-glib/libnm-glib.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS)
+
+EXTRA_DIST = \
+	add-connection-dbus-glib.c \
+	add-connection-libnm-glib.c \
+	get-active-connections-dbus-glib.c \
+	list-connections-dbus-glib.c \
+	list-connections-libnm-glib.c \
+	get-ap-info-libnm-glib.c
+
diff --git a/examples/C/add-connection-dbus-glib.c b/examples/C/glib/add-connection-dbus-glib.c
similarity index 100%
rename from examples/C/add-connection-dbus-glib.c
rename to examples/C/glib/add-connection-dbus-glib.c
diff --git a/examples/C/add-connection-libnm-glib.c b/examples/C/glib/add-connection-libnm-glib.c
similarity index 100%
rename from examples/C/add-connection-libnm-glib.c
rename to examples/C/glib/add-connection-libnm-glib.c
diff --git a/examples/C/get-active-connections-dbus-glib.c b/examples/C/glib/get-active-connections-dbus-glib.c
similarity index 100%
rename from examples/C/get-active-connections-dbus-glib.c
rename to examples/C/glib/get-active-connections-dbus-glib.c
diff --git a/examples/C/get-ap-info-libnm-glib.c b/examples/C/glib/get-ap-info-libnm-glib.c
similarity index 100%
rename from examples/C/get-ap-info-libnm-glib.c
rename to examples/C/glib/get-ap-info-libnm-glib.c
diff --git a/examples/C/list-connections-dbus-glib.c b/examples/C/glib/list-connections-dbus-glib.c
similarity index 100%
rename from examples/C/list-connections-dbus-glib.c
rename to examples/C/glib/list-connections-dbus-glib.c
diff --git a/examples/C/list-connections-libnm-glib.c b/examples/C/glib/list-connections-libnm-glib.c
similarity index 100%
rename from examples/C/list-connections-libnm-glib.c
rename to examples/C/glib/list-connections-libnm-glib.c