diff --git a/Makefile.am b/Makefile.am
index b2cff9aad54e983b87ccad8eabf78a92551ce6c0..029cbb7d7179d4e9012fa34ab66010c29ae23c0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,5 +18,5 @@
 
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = eek src tests bindings docs po
-DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
-EXTRA_DIST = eekboard-sample.conf
\ No newline at end of file
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+EXTRA_DIST = eekboard-sample.conf
diff --git a/eek/Makefile.am b/eek/Makefile.am
index b94bb9568dcd49940afaf5f614e341822c709022..44ba0084cd3364eb0f64c592001db7a31b75db1b 100644
--- a/eek/Makefile.am
+++ b/eek/Makefile.am
@@ -27,68 +27,68 @@ lib_LTLIBRARIES += libeek-clutter.la
 endif
 
 libeek_la_SOURCES = \
-	eek-layout.c \
-	eek-layout.h \
-	eek-element.c \
-	eek-element.h \
-	eek-container.c \
-	eek-container.h \
-	eek-keyboard.c \
-	eek-keyboard.h \
-	eek-section.c \
-	eek-section.h \
-	eek-key.c \
-	eek-key.h \
-	eek-types.h \
-	eek-types.c \
-	eek-keysym.h \
-	eek-keysym.c \
-	eek-special-keysym-labels.h \
-	eek-unicode-keysym-labels.h \
-	eek-keyname-keysym-labels.h
+	$(srcdir)/eek-layout.c \
+	$(srcdir)/eek-layout.h \
+	$(srcdir)/eek-element.c \
+	$(srcdir)/eek-element.h \
+	$(srcdir)/eek-container.c \
+	$(srcdir)/eek-container.h \
+	$(srcdir)/eek-keyboard.c \
+	$(srcdir)/eek-keyboard.h \
+	$(srcdir)/eek-section.c \
+	$(srcdir)/eek-section.h \
+	$(srcdir)/eek-key.c \
+	$(srcdir)/eek-key.h \
+	$(srcdir)/eek-types.h \
+	$(srcdir)/eek-types.c \
+	$(srcdir)/eek-keysym.h \
+	$(srcdir)/eek-keysym.c \
+	$(srcdir)/eek-special-keysym-labels.h \
+	$(srcdir)/eek-unicode-keysym-labels.h \
+	$(srcdir)/eek-keyname-keysym-labels.h
 libeek_la_CFLAGS = $(GOBJECT2_CFLAGS)
 libeek_la_LIBADD = $(GOBJECT2_LIBS) -lm
 
 if HAVE_CLUTTER
 libeek_clutter_la_SOURCES = \
-	eek-clutter-keyboard.c \
-	eek-clutter-keyboard.h \
-	eek-clutter-section.c \
-	eek-clutter-section.h \
-	eek-clutter-key.c \
-	eek-clutter-key.h \
-	eek-clutter-key-actor.c \
-	eek-clutter-key-actor.h \
-	eek-clutter-drawing-context.c \
-	eek-clutter-drawing-context.h \
-	eek-drawing.h \
-	eek-drawing.c \
-	eek-clutter.h
+	$(srcdir)/eek-clutter-keyboard.c \
+	$(srcdir)/eek-clutter-keyboard.h \
+	$(srcdir)/eek-clutter-section.c \
+	$(srcdir)/eek-clutter-section.h \
+	$(srcdir)/eek-clutter-key.c \
+	$(srcdir)/eek-clutter-key.h \
+	$(srcdir)/eek-clutter-key-actor.c \
+	$(srcdir)/eek-clutter-key-actor.h \
+	$(srcdir)/eek-clutter-drawing-context.c \
+	$(srcdir)/eek-clutter-drawing-context.h \
+	$(srcdir)/eek-drawing.h \
+	$(srcdir)/eek-drawing.c \
+	$(srcdir)/eek-clutter.h
 
 libeek_clutter_la_CFLAGS = $(CLUTTER_CFLAGS) $(CAIRO_LIBS) $(PANGO_LIBS)
 libeek_clutter_la_LIBADD = libeek.la $(CLUTTER_LIBS) $(CAIRO_LIBS) $(PANGO_LIBS)
 endif
 
 libeek_gtk_la_SOURCES = \
-	eek-gtk-keyboard.c \
-	eek-gtk-keyboard.h \
-	eek-drawing.h \
-	eek-drawing.c \
-	eek-gtk.h
+	$(srcdir)/eek-gtk-keyboard.c \
+	$(srcdir)/eek-gtk-keyboard.h \
+	$(srcdir)/eek-drawing.h \
+	$(srcdir)/eek-drawing.c \
+	$(srcdir)/eek-gtk.h
 
 libeek_gtk_la_CFLAGS = $(GTK2_CFLAGS) $(CAIRO_LIBS) $(PANGO_LIBS)
 libeek_gtk_la_LIBADD = libeek.la $(GTK2_LIBS) $(CAIRO_LIBS) $(PANGO_LIBS)
 
 libeek_xkb_la_SOURCES = \
-	eek-xkb-layout.h \
-	eek-xkb-layout.c
+	$(srcdir)/eek-xkb-layout.h \
+	$(srcdir)/eek-xkb-layout.c
 
 libeek_xkb_la_CFLAGS = $(GTK2_CFLAGS) $(XKB_CFLAGS)
 libeek_xkb_la_LIBADD = libeek.la $(GTK2_LIBS) $(XKB_LIBS)
 
 libeek_xkl_la_SOURCES = \
-	eek-xkl-layout.h \
-	eek-xkl-layout.c
+	$(srcdir)/eek-xkl-layout.h \
+	$(srcdir)/eek-xkl-layout.c
 
 libeek_xkl_la_CFLAGS = $(GTK2_CFLAGS) $(LIBXKLAVIER_CFLAGS)
 libeek_xkl_la_LIBADD = libeek-xkb.la $(GTK2_LIBS) $(LIBXKLAVIER_LIBS)
diff --git a/tests/eek-simple-test.c b/tests/eek-simple-test.c
index fabf5dff9736307f3e862e5018f4cd34bd15592f..b5295568696b394a32255f01311cd6bc0bed2452 100644
--- a/tests/eek-simple-test.c
+++ b/tests/eek-simple-test.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#include "eek.h"
+#include "eek/eek.h"
 
 static void
 test_create (void)
diff --git a/tests/eek-xkb-test.c b/tests/eek-xkb-test.c
index 2300b7558e49e1601cf346ac739fc24b160fcdfb..3c758cafc431b31fa66b6882f0d0d636412126e0 100644
--- a/tests/eek-xkb-test.c
+++ b/tests/eek-xkb-test.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#include "eek-xkb.h"
+#include "eek/eek-xkb.h"
 
 /* For gdk_x11_display_get_xdisplay().  See main(). */
 #include <gtk/gtk.h>