diff --git a/Makefile.am b/Makefile.am
index c3392b52477..62647cb6ffc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,6 @@ AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign
 SUBDIRS = \
 	compat \
 	contrib \
-	doc \
 	errors \
 	icons
 
@@ -23,7 +22,8 @@ SUBDIRS += \
 	scripts \
 	src \
 	tools \
-	test-suite
+	test-suite \
+	doc
 
 DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
 DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c95c7eb6a45..6b15157b605 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -14,3 +14,8 @@ DEFAULT_ERROR_DIR       = $(datadir)/errors
 EXTRA_DIST = \
 	debug-messages.dox \
 	debug-sections.txt
+
+cfgman: $(top_builddir)/src/cf.data $(top_srcdir)/scripts/www/build-cfg-help.pl
+	@mkdir -p cfgman
+	$(top_srcdir)/scripts/www/build-cfg-help.pl --version $(VERSION) -o cfgman $(top_builddir)/src/cf.data
+	$(top_srcdir)/scripts/www/build-cfg-help.pl --version $(VERSION) -o squid-$(VERSION)-cfgman.html -f singlehtml $(top_builddir)/src/cf.data