diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 081b985570..4342215b0e 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -47,7 +47,7 @@ $(man-pages): $(d)/manual.xmli $(d)/manual.is-valid
 
 clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
 
-dist-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
+dist-files += $(man-pages)
 
 
 # Generate the HTML manual.
diff --git a/local.mk b/local.mk
index 174e6150e0..c48857f24b 100644
--- a/local.mk
+++ b/local.mk
@@ -1,4 +1,6 @@
-dist-files += $(shell git ls-files) $(shell git ls-files)
+ifeq ($(MAKECMDGOALS), dist)
+  dist-files += $(shell git ls-files) $(shell git ls-files)
+endif
 
 dist-files += configure config.h.in