diff --git a/Makefile.am b/Makefile.am
index 675c0fd..84685fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,3 +13,13 @@ r3_include_HEADERS = \
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = r3.pc
+
+EXTRA_DIST = \
+	autogen.sh \
+	bench.html \
+	demo.c \
+	gen_routes.rb \
+	HACKING.md \
+	LICENSE \
+	README.md \
+	$(NULL)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ec7fb86..5853f4b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,6 +6,14 @@
 # endif
 TESTS                       = check_tree
 
+noinst_HEADERS = \
+	bench.h \
+	$(NULL)
+
+dist_noinst_DATA = \
+	bench_str.csv \
+	$(NULL)
+
 if ENABLE_GRAPHVIZ
 TESTS += check_gvc
 check_gvc_SOURCES = check_gvc.c bench.c