diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..bfd964e3
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libgd"]
+	path = libgd
+	url = git://git.gnome.org/libgd
diff --git a/Makefile.am b/Makefile.am
index d1603ada..f258dc24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
 
-SUBDIRS = src data po doc
+SUBDIRS = libgd src data po doc
 
 gnome_calendardocdir = ${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}
 gnome_calendardoc_DATA =        \
diff --git a/autogen.sh b/autogen.sh
index 4b0d03e4..82ea1487 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,7 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="gnome-calendar"
+ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS"
 
 (test -f $srcdir/configure.ac \
   && test -d $srcdir/src) || {
@@ -18,4 +19,7 @@ which gnome-autogen.sh || {
     echo "your OS vendor's package manager)."
     exit 1
 }
+
+git submodule update --init --recursive
+
 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 872089fa..8810d831 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 # require automake 1.11
 AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip tar-ustar])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
 
 dnl ***************************************************************************
 dnl Internationalization
@@ -19,7 +19,7 @@ dnl ***************************************************************************
 IT_PROG_INTLTOOL([0.35.0])
 PKG_PROG_PKG_CONFIG([0.22])
 
-GETTEXT_PACKAGE=gnome-calendar
+GETTEXT_PACKAGE=AC_PACKAGE_TARNAME
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 
@@ -84,8 +84,18 @@ PKG_CHECK_MODULES(CALENDAR,
                   libedataserver-1.2 >= $EDATASERVER_REQUIRED
                   libical >= $LIBICAL_REQUIRED)
 
+LIBGD_INIT([
+  header-bar
+  notification
+  revealer
+  stack
+  static
+  tagged-entry
+])
+
 AC_CONFIG_FILES([
       Makefile
+      libgd/Makefile
       src/Makefile
       data/Makefile
       data/gnome-calendar.desktop.in
diff --git a/libgd b/libgd
new file mode 160000
index 00000000..5f75e01e
--- /dev/null
+++ b/libgd
@@ -0,0 +1 @@
+Subproject commit 5f75e01e74235e2a503356e2198599cb1105b7dc