diff --git a/Makefile.am b/Makefile.am
index 4c981a4c..6f78aa41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,10 +11,15 @@ EXTRA_DIST =
 
 include $(top_srcdir)/buildutil/glib-tap.mk
 
+SUBDIRS =
+
+
 if BUILD_DOCUMENTATION
-SUBDIRS = . doc
+SUBDIRS += . doc
 endif
 
+SUBDIRS += po
+
 %.service: %.service.in config.log
 	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
@@ -118,6 +123,5 @@ EXTRA_DIST += xdg-app.pc.in
 
 DISTCHECK_CONFIGURE_FLAGS =		\
 	--enable-documentation		\
-	--enable-libxdgapp		\
 	--disable-maintainer-mode	\
 	--enable-introspection
diff --git a/buildutil/glib-tap.mk b/buildutil/glib-tap.mk
index 07a9c384..88b9fb1a 100644
--- a/buildutil/glib-tap.mk
+++ b/buildutil/glib-tap.mk
@@ -26,6 +26,8 @@ check_PROGRAMS =
 check_SCRIPTS =
 check_DATA =
 
+EXTRA_DIST += buildutil/tap-driver.sh buildutil/tap-test
+
 # We support a fairly large range of possible variables.  It is expected that all types of files in a test suite
 # will belong in exactly one of the following variables.
 #
diff --git a/system-helper/Makefile.am.inc b/system-helper/Makefile.am.inc
index 8de452c4..24bb80d1 100644
--- a/system-helper/Makefile.am.inc
+++ b/system-helper/Makefile.am.inc
@@ -30,5 +30,5 @@ dist_polkit_policy_DATA =					\
 
 @INTLTOOL_POLICY_RULE@
 
-EXTRA_DIST += system-helper/org.freedesktop.XdgApp.policy.in
+EXTRA_DIST += system-helper/org.freedesktop.XdgApp.policy.in system-helper/org.freedesktop.XdgApp.SystemHelper.conf
 DISTCLEANFILES += system-helper/org.freedesktop.XdgApp.policy
diff --git a/tests/Makefile.am.inc b/tests/Makefile.am.inc
index 60aa42df..0d7d3c89 100644
--- a/tests/Makefile.am.inc
+++ b/tests/Makefile.am.inc
@@ -62,6 +62,8 @@ installed_test_data = \
 	tests/session.conf.in \
 	$(NULL)
 
+EXTRA_DIST += $(installed_test_SCRIPTS) $(installed_test_data)
+
 test_scripts = \
 	tests/test-basic.sh \
 	tests/test-run.sh \