diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 8166f45e..1227c034 100644
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -21,8 +21,8 @@ include Makefile-libostree-defines.am
 
 lib_LTLIBRARIES += libostree-1.la
 
-libostreeheadersdir = $(includedir)/ostree-1
-libostreeheaders_DATA = $(libostree_public_headers)
+libostreeincludedir = $(includedir)/ostree-1
+libostreeinclude_HEADERS = $(libostree_public_headers)
 
 libostree_1_la_SOURCES = \
 	src/libostree/ostree-core.c \
@@ -79,10 +79,8 @@ OSTree_1_0_gir_FILES = $(libostreeheaders_DATA) $(filter-out %-private.h,$(libos
 INTROSPECTION_GIRS += OSTree-1.0.gir
 gir_DATA += OSTree-1.0.gir
 typelib_DATA += OSTree-1.0.typelib
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
 endif
 
 pkgconfig_DATA += src/libostree/ostree-1.pc
-
-INSTALL_DATA_HOOKS += install-libostree-data-hook
-install-libostree-data-hook: 
-	rm -f $(DESTDIR)$(libdir)/libostree-1.la
diff --git a/Makefile.am b/Makefile.am
index bcd28e5b..74102feb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@ AM_CPPFLAGS = -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
 	-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_34 \
 	-DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_40
 AM_CFLAGS = $(WARN_CFLAGS)
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-maintainer-mode
 
 # Subdirectories
 SUBDIRS =