diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 7c71920c4..20440aaee 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -59,9 +59,13 @@ generator_built = \
 	structs.ml \
 	structs.mli
 
+CONFIGURE_GENERATED_ML = \
+	daemon_config.ml
+
 EXTRA_DIST = \
 	$(generator_built) \
-	$(SOURCES_MLI) $(SOURCES_ML) \
+	$(SOURCES_MLI) \
+	$(filter-out $(CONFIGURE_GENERATED_ML),$(SOURCES_ML)) \
 	daemon_utils_tests.ml \
 	guestfsd.pod
 
@@ -297,7 +301,7 @@ SOURCES_MLI = \
 	utils.mli
 
 SOURCES_ML = \
-	daemon_config.ml \
+	$(CONFIGURE_GENERATED_ML) \
 	utils.ml \
 	structs.ml \
 	optgroups.ml \
diff --git a/python/Makefile.am b/python/Makefile.am
index 673de3157..9aca202b5 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -38,8 +38,9 @@ EXTRA_DIST = \
 	setup.py.in \
 	run-bindtests \
 	run-python-tests \
+	t/__init__.py \
 	t/README \
-	t/*.py
+	t/test[0-9]*.py
 
 if HAVE_PYTHON
 
diff --git a/rust/Makefile.am b/rust/Makefile.am
index c96607621..979e98bd4 100644
--- a/rust/Makefile.am
+++ b/rust/Makefile.am
@@ -26,7 +26,6 @@ EXTRA_DIST = \
 	tests/*.rs \
 	src/*.rs \
 	src/bin/*.rs \
-	Cargo.toml \
 	README.md \
 	run-bindtests \
 	run-tests
diff --git a/tests/daemon/Makefile.am b/tests/daemon/Makefile.am
index 053cad3e1..921e6d1df 100644
--- a/tests/daemon/Makefile.am
+++ b/tests/daemon/Makefile.am
@@ -30,7 +30,6 @@ TESTS = \
 TESTS_ENVIRONMENT = $(top_builddir)/run --test
 
 EXTRA_DIST = \
-	captive-daemon.pm \
 	$(TESTS)
 
 check-valgrind: