diff --git a/Makefile.am b/Makefile.am
index 8f5b85bf69..bf891b487d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -180,11 +180,8 @@ install-exec-hook:
 	mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}
 	mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME}
 
-EXTRA_DIST  = tools/path_replacer.sh
-EXTRA_DIST += tools/mk_cfgrpt.sh
-
 #### include external sources in the distributed tarball:
-EXTRA_DIST += ext/coroutine/coroutine.hpp
+EXTRA_DIST = ext/coroutine/coroutine.hpp
 
 CLEANFILES = $(abs_top_builddir)/logger_lockfile
 
diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index d60332974f..e7f9d8ea50 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -22,6 +22,9 @@ rst_arm_sources =
 rst_arm_sources += index.rst
 rst_arm_sources += manpages.rst
 rst_arm_sources += umls.rst
+rst_arm_sources += debug-messages.rst
+rst_arm_sources += kea-messages.rst
+
 include arm/rst_arm_sources.mk
 
 EXTRA_DIST += arm/rst_arm_sources.mk
@@ -61,9 +64,9 @@ api_files =
 include $(top_srcdir)/src/share/api/api_files.mk
 
 if HAVE_PDFLATEX
-all: debug-messages.rst kea-messages.rst html mans pdf text
+all: debug-messages.rst kea-messages.rst html mans pdf singlehtml text
 else
-all: debug-messages.rst kea-messages.rst html mans text
+all: debug-messages.rst kea-messages.rst html mans singlehtml text
 endif
 
 # build the list of message files
@@ -85,6 +88,9 @@ $(srcdir)/kea-messages.rst: mes2doc.py
 api-files.txt: $(top_srcdir)/src/share/api/api_files.mk
 	@sed 's;api_files .*)/;;' $< > $@
 
+EXTRA_DIST += debug-messages.rst
+EXTRA_DIST += kea-messages.rst
+
 # some tools do not use this makefile but still need generate files.
 EXTRA_DIST += mes-files.txt api-files.txt
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6b9a992735..2766f42494 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -6,5 +6,10 @@ if USE_STATIC_LINK
 AM_LDFLAGS = -static
 endif
 
+EXTRA_DIST  =
+EXTRA_DIST += check-messages.py
+EXTRA_DIST += mk_cfgrpt.sh
+EXTRA_DIST += path_replacer.sh
+
 CLEANFILES = *.gcno *.gcda
 DISTCLEANFILES = path_replacer.sh