diff --git a/Makefile.am b/Makefile.am
index 81cad53..f35e697 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,2 @@
+EXTRA_DIST = LICENSE README.rst
 SUBDIRS = doc src test
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 49c98c9..c28c140 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = conf.py apiref.rst index.rst
+EXTRA_DIST = conf.py apiref.rst index.rst ext/refcounting.py
 
 clean-local:
 	rm -rf .build
diff --git a/test/Makefile.am b/test/Makefile.am
index ce169ae..ed11110 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,3 +1,4 @@
+DIST_SUBDIRS = testprogs testdata
 SUBDIRS = testprogs
 
 check_PROGRAMS = loadf_dumpf loads_dumps load_file_dump_file
@@ -9,5 +10,13 @@ LDADD = ../src/libjansson.la
 
 TESTS = test-api test-invalid test-valid
 
+EXTRA_DIST = \
+	test-api \
+	test-invalid \
+	test-valid \
+	run-test \
+	json-compare.py \
+	split-testfile.py
+
 clean-local:
 	rm -rf testlogs
diff --git a/test/testdata/Makefile.am b/test/testdata/Makefile.am
new file mode 100644
index 0000000..25d631b
--- /dev/null
+++ b/test/testdata/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = invalid invalid-unicode valid