diff --git a/.gitmodules b/.gitmodules
index e69de29..f24da7e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libgd"]
+	path = libgd
+	url = git://git.gnome.org/libgd.git
diff --git a/Makefile.am b/Makefile.am
index 3583957..b9abb11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src po data help
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
+SUBDIRS = libgd src po data help
 
 EXTRA_DIST = config.rpath ChangeLog
 
diff --git a/autogen.sh b/autogen.sh
index d88fb6f..80da03b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,6 +4,8 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
+ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS"
+
 PKG_NAME="astrognome"
 
 (test -f $srcdir/configure.ac \
@@ -18,5 +20,7 @@ which gnome-autogen.sh || {
     exit 1
 }
 
+git submodule update --init --recursive
+
 REQUIRED_AUTOMAKE_VERSION=1.9 . gnome-autogen.sh
 
diff --git a/configure.ac b/configure.ac
index d5dfccb..5607950 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,13 @@ PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-3.0])
 PKG_CHECK_MODULES([GDA], [libgda-5.0 libgda-sqlite-5.0])
 PKG_CHECK_MODULES([SWE_GLIB], [swe-glib >= 2.1.0])
 
+LIBGD_INIT([
+    main-view
+])
+
 AC_CONFIG_FILES([
     Makefile
+    libgd/Makefile
     src/Makefile
     help/Makefile
     po/Makefile.in
diff --git a/libgd b/libgd
new file mode 160000
index 0000000..62f9b8b
--- /dev/null
+++ b/libgd
@@ -0,0 +1 @@
+Subproject commit 62f9b8b92599b38d986bd26d5780edd400d318c9
diff --git a/src/Makefile.am b/src/Makefile.am
index 94116d3..61e5bb9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,11 +27,11 @@ EXTRA_DIST = \
 			 ag.gresource.xml \
 			 $(NULL)
 
-AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Astrognome\" -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Astrognome\" -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\" -I$(top_srcdir)/libgd
 bin_PROGRAMS = astrognome
 
 astrognome_SOURCES = $(astrognome_source_files) $(BUILT_SOURCES)
-astrognome_LDADD = $(SWE_GLIB_LIBS) $(GTK_LIBS) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(WEBKIT_LIBS) $(GDA_LIBS)
+astrognome_LDADD = $(SWE_GLIB_LIBS) $(GTK_LIBS) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(WEBKIT_LIBS) $(GDA_LIBS) $(top_builddir)/libgd/libgd.la
 astrognome_LDFLAGS = -rdynamic
 astrognome_CFLAGS = $(SWE_GLIB_CFLAGS) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(WEBKIT_CFLAGS) $(GDA_CFLAGS) -Wall