diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..303eb9b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libgd"]
+	path = libgd
+	url = ../libgd
diff --git a/Makefile.am b/Makefile.am
index df1687e..40ae6c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
 NULL=
-SUBDIRS = src vapi data po
+SUBDIRS = libgd src vapi data po
 EXTRA_DIST = \
 	autogen.sh \
 	intltool-extract.in \
diff --git a/autogen.sh b/autogen.sh
index 1eeb771..28a5a89 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 mkdir -p m4
 autopoint --force
+git submodule update --init --recursive
 AUTOPOINT='intltoolize --automake --copy' autoreconf -fiv -Wall || exit
 ./configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
index 0759bdc..fab2156 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile
+		libgd/Makefile
 		vapi/Makefile
 		src/Makefile
 		data/Makefile
@@ -76,4 +77,15 @@ AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
 GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
 AC_SUBST(GLIB_COMPILE_RESOURCES)
 
+dnl libgd
+LIBGD_INIT([
+  gtk-hacks
+  main-toolbar
+  main-icon-view
+  margin-container
+  static
+  tagged-entry
+  vapi
+])
+
 AC_OUTPUT
diff --git a/libgd b/libgd
new file mode 160000
index 0000000..f63cab2
--- /dev/null
+++ b/libgd
@@ -0,0 +1 @@
+Subproject commit f63cab25ce05bd3bc83ef9e389b299f96339f7fe
diff --git a/src/Makefile.am b/src/Makefile.am
index 69c15fa..26bdd8d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
 	-include config.h \
 	$(CONTACTS_CFLAGS) \
 	-I$(srcdir)/listbox \
+	-I$(top_srcdir)/libgd \
 	-DLOCALEDIR=\""$(localedir)"\" \
 	-DPKGDATADIR=\""$(pkgdatadir)"\" \
 	-DPKGLIBDIR=\""$(pkglibdir)"\" \
@@ -11,7 +12,7 @@ AM_CPPFLAGS = \
 	$(NULL)
 
 AM_VALAFLAGS = \
-	--vapidir=$(srcdir)/../vapi --vapidir=$(srcdir)/listbox --pkg config --pkg custom --pkg egglistbox \
+	--vapidir=$(srcdir)/../vapi --vapidir=$(srcdir)/listbox --vapidir=$(top_srcdir)/libgd --pkg config --pkg custom --pkg egglistbox --pkg gd-1.0 \
 	@CONTACTS_PACKAGES@ \
 	$(NULL)
 
@@ -67,7 +68,7 @@ gnome_contacts_SOURCES = \
 	$(vala_sources) \
 	$(NULL)
 
-gnome_contacts_LDADD = $(CONTACTS_LIBS) -lm
+gnome_contacts_LDADD = $(CONTACTS_LIBS) -lm $(top_builddir)/libgd/libgd.la
 
 if BUILD_CHEESE
 gnome_contacts_LDADD += $(CHEESE_LIBS)