diff --git a/Makefile.am b/Makefile.am
index c3392b52477..c2155927414 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,6 @@ AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign
 SUBDIRS = \
 	compat \
 	contrib \
-	doc \
 	errors \
 	icons
 
@@ -25,6 +24,10 @@ SUBDIRS += \
 	tools \
 	test-suite
 
+if ENABLE_DOCUMENTATION
+SUBDIRS += doc
+endif
+
 DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
 DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
 
diff --git a/configure.ac b/configure.ac
index 12a984c682f..9b65b085315 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,21 +135,15 @@ AS_IF([test "x$PKG_CONFIG" = "x"],[
   AC_MSG_WARN([pkg-config not found. Many optional features with external dependencies will not be enabled by default, usually without further warnings.])
 ])
 
-
 AC_PATH_PROG(PERL, perl, none)
 AS_IF([test "x$ac_cv_path_PERL" = "xnone"],[
   AC_MSG_FAILURE([Perl is required to compile Squid. Please install Perl and then re-run configure ])
 ])
-AC_PATH_PROG(POD2MAN, pod2man, $FALSE)
-AM_CONDITIONAL(ENABLE_POD2MAN_DOC, test "x${ac_cv_path_POD2MAN}" != "x$FALSE")
 
 AC_PATH_PROG(AR, ar, $FALSE)
 AR_R="$AR r"
 AC_SUBST(AR_R)
 
-AC_PATH_PROG(LINUXDOC, linuxdoc, $FALSE)
-AM_CONDITIONAL(ENABLE_RELEASE_DOCS, test "x${ac_cv_path_LINUXDOC}" != "x$FALSE")
-
 SQUID_RELEASE=`echo $VERSION | cut -d. -f1`
 AC_SUBST(SQUID_RELEASE)
 
@@ -364,6 +358,25 @@ SQUID_CFLAGS="$SQUID_CFLAGS $squid_cv_cc_arg_pipe"
 # possibly include some build info tag into squid -v
 SQUID_EMBED_BUILD_INFO
 
+AC_ARG_ENABLE(documentation,
+  AS_HELP_STRING([--enable-documentation],[
+    Build optional documentation.
+    Requires linuxdoc and pod2man.
+  ]),[
+  SQUID_YESNO([$enableval],[--enable-documentation])
+])
+AS_IF([test "x$enable_documentation" = "xyes"],[
+  AC_CHECK_TOOL([LINUXDOC],[linuxdoc],[:])
+  AS_IF([test "$LINUXDOC" = ":"],[
+    AC_MSG_FAILURE([linuxdoc is required to compile Squid documentation. Please install linuxdoc tools and then re-run configure.])
+  ])
+  AC_CHECK_TOOL([POD2MAN],[pod2man],[:])
+  AS_IF([test "$POD2MAN" = ":"],[
+    AC_MSG_FAILURE([pod2man is required to compile Squid documentation. Please install pod2man and then re-run configure.])
+  ])
+])
+AM_CONDITIONAL(ENABLE_DOCUMENTATION,[test "x$enable_documentation" = "xyes"])
+
 AC_ARG_ENABLE(optimizations,
   AS_HELP_STRING([--disable-optimizations],
                  [Do not compile Squid with compiler optimizations enabled.
diff --git a/doc/release-notes/Makefile.am b/doc/release-notes/Makefile.am
index b903725140f..e9c1cb88ade 100644
--- a/doc/release-notes/Makefile.am
+++ b/doc/release-notes/Makefile.am
@@ -5,11 +5,10 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-# requires the linuxdoc tools
-if ENABLE_RELEASE_DOCS
-
 DOC= release-$(SQUID_RELEASE)
 
+EXTRA_DIST= $(DOC).sgml
+
 SUFFIXES= .sgml.in .sgml
 
 .sgml.in.sgml:
@@ -20,31 +19,21 @@ SUFFIXES= .sgml.in .sgml
         < $< >$@
 	test `grep -c "@SQUID" $@` -eq 0
 
+if ENABLE_DOCUMENTATION
 .sgml.txt:
-	linuxdoc -B txt --filter $<
+	$(LINUXDOC) -B txt --filter $<
 
 .sgml.html:
-	linuxdoc -B html -T 2 --split=0 $<
-	perl -i -p -e "s%$@%%" $@
-	cp -p $@ $(top_builddir)/RELEASENOTES.html
+	$(LINUXDOC) -B html -T 2 --split=0 $< && $(PERL) -i -p -e "s%$@%%" $@
 
 .sgml.man:
-	linuxdoc -B txt --manpage $<
+	$(LINUXDOC) -B txt --manpage $<
 
 .sgml.info:
-	linuxdoc -B info $<
-
-dist-hook: $(DOC).html
-	@if test -f $(builddir)/$(DOC).html; then \
-	  cp -p $(builddir)/$(DOC).html $(top_distdir)/RELEASENOTES.html; \
-	fi
-
-EXTRA_DIST= $(DOC).html
+	$(LINUXDOC) -B info $<
 
 CLEANFILES= \
 	*.html \
 	*.tex *.ps *.dvi *.aux *.log *.toc \
-	*.txt *.man \
-	$(top_builddir)/RELEASENOTES.html
-
+	*.txt *.man
 endif
diff --git a/doc/release-notes/release-8.sgml.in b/doc/release-notes/release-8.sgml.in
index 8ddb88821e7..9538e4a5a18 100644
--- a/doc/release-notes/release-8.sgml.in
+++ b/doc/release-notes/release-8.sgml.in
@@ -144,7 +144,8 @@ This section gives an account of those changes in three categories:
 <sect1>New options<label id="newoptions">
 <p>
 <descrip>
-	<p>No new options in this version.
+	<tag>--enable-documentation</tag>
+	<p>Build optional documentation for Squid.
 
 </descrip>
 
diff --git a/mkrelease.sh b/mkrelease.sh
index cabfb6d445c..e15ab6d46f8 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -78,7 +78,7 @@ g/squid_curtime/ s//${RELEASE_TIME}/
 w
 EOS
 
-./configure --silent --enable-translation
+./configure --silent --enable-translation --enable-documentation
 make dist-all
 
 cd $startdir
diff --git a/src/Common.am b/src/Common.am
index 14821eefb0b..6a9bef673de 100644
--- a/src/Common.am
+++ b/src/Common.am
@@ -69,4 +69,10 @@ COMPAT_LIB = $(top_builddir)/compat/libcompatsquid.la $(LIBPROFILER)
 ## Some helpers are written in Perl and need the local shell defined properly
 subst_perlshell = sed -e 's,[@]PERL[@],$(PERL),g' <$(srcdir)/$@.pl.in >$@ || ($(RM) -f $@ ; exit 1)
 
+if ENABLE_DOCUMENTATION
+SUFFIXES= .pl.in .8
+.pl.in.8:
+	$(POD2MAN) --section=8 <$< >$@
+endif
+
 include $(top_srcdir)/src/TestHeaders.am
diff --git a/src/acl/external/SQL_session/Makefile.am b/src/acl/external/SQL_session/Makefile.am
index c82a15c0de8..b3f6fdbb126 100644
--- a/src/acl/external/SQL_session/Makefile.am
+++ b/src/acl/external/SQL_session/Makefile.am
@@ -16,12 +16,8 @@ EXTRA_DIST= \
 ext_sql_session_acl: ext_sql_session_acl.pl.in
 	$(subst_perlshell)
 
-if ENABLE_POD2MAN_DOC
+if ENABLE_DOCUMENTATION
 man_MANS = ext_sql_session_acl.8
 CLEANFILES += ext_sql_session_acl.8
 EXTRA_DIST += ext_sql_session_acl.8
-
-ext_sql_session_acl.8: ext_sql_session_acl
-	pod2man --section=8 ext_sql_session_acl ext_sql_session_acl.8
-
 endif
diff --git a/src/acl/external/SQL_session/required.m4 b/src/acl/external/SQL_session/required.m4
index b4c7abc76ae..7133ae7d22e 100755
--- a/src/acl/external/SQL_session/required.m4
+++ b/src/acl/external/SQL_session/required.m4
@@ -8,7 +8,3 @@
 if test "x$PERL" != "x"; then
   BUILD_HELPER="SQL_session"
 fi
-if test "x$POD2MAN" = "x"; then
-  AC_MSG_WARN([pod2man not found. ext_sql_session_acl man(8) page will not be built])
-fi
-
diff --git a/src/acl/external/delayer/Makefile.am b/src/acl/external/delayer/Makefile.am
index 2d9984d8d70..a4d6d0df02a 100644
--- a/src/acl/external/delayer/Makefile.am
+++ b/src/acl/external/delayer/Makefile.am
@@ -16,12 +16,8 @@ EXTRA_DIST= \
 ext_delayer_acl: ext_delayer_acl.pl.in
 	$(subst_perlshell)
 
-if ENABLE_POD2MAN_DOC
+if ENABLE_DOCUMENTATION
 man_MANS = ext_delayer_acl.8
 CLEANFILES += ext_delayer_acl.8
 EXTRA_DIST += ext_delayer_acl.8
-
-ext_delayer_acl.8: ext_delayer_acl
-	pod2man --section=8 ext_delayer_acl ext_delayer_acl.8
-
 endif
diff --git a/src/acl/external/delayer/required.m4 b/src/acl/external/delayer/required.m4
index 4c1f6bffa50..54a3749682d 100755
--- a/src/acl/external/delayer/required.m4
+++ b/src/acl/external/delayer/required.m4
@@ -8,7 +8,3 @@
 if test "x$PERL" != "x"; then
   BUILD_HELPER="delayer"
 fi
-if test "x$POD2MAN" = "x"; then
-  AC_MSG_WARN([pod2man not found. ext_delayer_acl man(8) page will not be built])
-fi
-
diff --git a/src/acl/external/kerberos_sid_group/Makefile.am b/src/acl/external/kerberos_sid_group/Makefile.am
index 64547d8049b..275535c7324 100644
--- a/src/acl/external/kerberos_sid_group/Makefile.am
+++ b/src/acl/external/kerberos_sid_group/Makefile.am
@@ -16,13 +16,8 @@ EXTRA_DIST= \
 ext_kerberos_sid_group_acl: ext_kerberos_sid_group_acl.pl.in
 	$(subst_perlshell)
 
-if ENABLE_POD2MAN_DOC
+if ENABLE_DOCUMENTATION
 man_MANS = ext_kerberos_sid_group_acl.8
 CLEANFILES += ext_kerberos_sid_group_acl.8
 EXTRA_DIST += ext_kerberos_sid_group_acl.8
-
-ext_kerberos_sid_group_acl.8: ext_kerberos_sid_group_acl
-	pod2man --section=8 ext_kerberos_sid_group_acl ext_kerberos_sid_group_acl.8
-
 endif
-
diff --git a/src/acl/external/kerberos_sid_group/required.m4 b/src/acl/external/kerberos_sid_group/required.m4
index 4752816a8c0..17e8e40d244 100755
--- a/src/acl/external/kerberos_sid_group/required.m4
+++ b/src/acl/external/kerberos_sid_group/required.m4
@@ -14,7 +14,3 @@ fi
 if test "x$PERL" != "x"; then
   BUILD_HELPER="kerberos_sid_group"
 fi
-if test "x$POD2MAN" = "x"; then
-  AC_MSG_WARN([pod2man not found. ext_kerberos_sid_group_acl man(8) page will not be built])
-fi
-
diff --git a/src/acl/external/wbinfo_group/Makefile.am b/src/acl/external/wbinfo_group/Makefile.am
index 719057656be..0dac9a9de93 100644
--- a/src/acl/external/wbinfo_group/Makefile.am
+++ b/src/acl/external/wbinfo_group/Makefile.am
@@ -16,12 +16,8 @@ EXTRA_DIST= \
 ext_wbinfo_group_acl: ext_wbinfo_group_acl.pl.in
 	$(subst_perlshell)
 
-if ENABLE_POD2MAN_DOC
+if ENABLE_DOCUMENTATION
 man_MANS = ext_wbinfo_group_acl.8
 CLEANFILES += ext_wbinfo_group_acl.8
 EXTRA_DIST += ext_wbinfo_group_acl.8
-
-ext_wbinfo_group_acl.8: ext_wbinfo_group_acl
-	pod2man --section=8 ext_wbinfo_group_acl ext_wbinfo_group_acl.8
-
 endif
diff --git a/src/acl/external/wbinfo_group/required.m4 b/src/acl/external/wbinfo_group/required.m4
index 01136fb6180..9ff72047d1e 100755
--- a/src/acl/external/wbinfo_group/required.m4
+++ b/src/acl/external/wbinfo_group/required.m4
@@ -18,7 +18,3 @@ fi
 if test "x$PERL" != "x"; then
   BUILD_HELPER="wbinfo_group"
 fi
-if test "x$POD2MAN" = "x"; then
-  AC_MSG_WARN([pod2man not found. ext_wbinfo_group_acl man(8) page will not be built])
-fi
-
diff --git a/src/auth/basic/DB/Makefile.am b/src/auth/basic/DB/Makefile.am
index bfdd2910999..fff4df158a4 100644
--- a/src/auth/basic/DB/Makefile.am
+++ b/src/auth/basic/DB/Makefile.am
@@ -16,12 +16,8 @@ EXTRA_DIST= \
 basic_db_auth: basic_db_auth.pl.in
 	$(subst_perlshell)
 
-if ENABLE_POD2MAN_DOC
+if ENABLE_DOCUMENTATION
 man_MANS = basic_db_auth.8
 CLEANFILES += basic_db_auth.8
 EXTRA_DIST += basic_db_auth.8
-
-basic_db_auth.8: basic_db_auth
-	pod2man --section=8 basic_db_auth basic_db_auth.8
-
 endif
diff --git a/src/auth/basic/DB/required.m4 b/src/auth/basic/DB/required.m4
index b86f95ee086..917d0d19c37 100755
--- a/src/auth/basic/DB/required.m4
+++ b/src/auth/basic/DB/required.m4
@@ -6,7 +6,3 @@
 ##
 
 AS_IF([test "x$PERL" != "x"],[BUILD_HELPER="DB"])
-AS_IF([test "x$POD2MAN" = "x"],[
-  AC_MSG_WARN([pod2man not found. basic_db_auth man(8) page will not be built])
-])
-
diff --git a/src/auth/basic/POP3/Makefile.am b/src/auth/basic/POP3/Makefile.am
index 812ac755a89..6b260d4400f 100644
--- a/src/auth/basic/POP3/Makefile.am
+++ b/src/auth/basic/POP3/Makefile.am
@@ -16,12 +16,8 @@ EXTRA_DIST= \
 basic_pop3_auth: basic_pop3_auth.pl.in
 	$(subst_perlshell)
 
-if ENABLE_POD2MAN_DOC
+if ENABLE_DOCUMENTATION
 man_MANS = basic_pop3_auth.8
 CLEANFILES += basic_pop3_auth.8
 EXTRA_DIST += basic_pop3_auth.8
-
-basic_pop3_auth.8: basic_pop3_auth
-	pod2man --section=8 basic_pop3_auth basic_pop3_auth.8
-
 endif
diff --git a/src/auth/basic/POP3/required.m4 b/src/auth/basic/POP3/required.m4
index 9d37041ad6b..1aae9c33921 100755
--- a/src/auth/basic/POP3/required.m4
+++ b/src/auth/basic/POP3/required.m4
@@ -6,7 +6,3 @@
 ##
 
 AS_IF([test "x$PERL" != "x"],[BUILD_HELPER="POP3"])
-AS_IF([test "x$POD2MAN" = "x"],[
-  AC_MSG_WARN([pod2man not found. basic_pop3_auth man(8) page will not be built])
-])
-
diff --git a/src/http/url_rewriters/LFS/Makefile.am b/src/http/url_rewriters/LFS/Makefile.am
index 0eaec543d13..a499a362bb9 100644
--- a/src/http/url_rewriters/LFS/Makefile.am
+++ b/src/http/url_rewriters/LFS/Makefile.am
@@ -22,12 +22,8 @@ EXTRA_DIST= \
 url_lfs_rewrite: url_lfs_rewrite.pl.in
 	$(subst_perlshell)
 
-if ENABLE_POD2MAN_DOC
+if ENABLE_DOCUMENTATION
 man_MANS = url_lfs_rewrite.8
 CLEANFILES += url_lfs_rewrite.8
 EXTRA_DIST += url_lfs_rewrite.8
-
-url_lfs_rewrite.8: url_lfs_rewrite
-	pod2man --section=8 url_lfs_rewrite url_lfs_rewrite.8
-
 endif
diff --git a/src/http/url_rewriters/LFS/required.m4 b/src/http/url_rewriters/LFS/required.m4
index 07e96c17221..8092385a527 100644
--- a/src/http/url_rewriters/LFS/required.m4
+++ b/src/http/url_rewriters/LFS/required.m4
@@ -8,7 +8,3 @@
 if test "x$PERL" != "x"; then
   BUILD_HELPER="LFS"
 fi
-if test "x$POD2MAN" = "x"; then
-  AC_MSG_WARN([pod2man not found. url_lfs_rewrite man(8) page will not be built])
-fi
-
diff --git a/src/log/DB/Makefile.am b/src/log/DB/Makefile.am
index 4802b7b079b..825bfa693a3 100644
--- a/src/log/DB/Makefile.am
+++ b/src/log/DB/Makefile.am
@@ -18,12 +18,8 @@ EXTRA_DIST= \
 log_db_daemon: log_db_daemon.pl.in
 	$(subst_perlshell)
 
-if ENABLE_POD2MAN_DOC
+if ENABLE_DOCUMENTATION
 man_MANS = log_db_daemon.8
 CLEANFILES += log_db_daemon.8
 EXTRA_DIST += log_db_daemon.8
-
-log_db_daemon.8: log_db_daemon
-	pod2man --section=8 log_db_daemon log_db_daemon.8
-
 endif
diff --git a/src/log/DB/required.m4 b/src/log/DB/required.m4
index 33726ae5b06..917d0d19c37 100755
--- a/src/log/DB/required.m4
+++ b/src/log/DB/required.m4
@@ -6,7 +6,3 @@
 ##
 
 AS_IF([test "x$PERL" != "x"],[BUILD_HELPER="DB"])
-AS_IF([test "x$POD2MAN" = "x"],[
-  AC_MSG_WARN([pod2man not found. log_db_daemon man(8) page will not be built])
-])
-
diff --git a/src/security/cert_validators/fake/Makefile.am b/src/security/cert_validators/fake/Makefile.am
index 83c6ed6090f..2ae4761b07e 100644
--- a/src/security/cert_validators/fake/Makefile.am
+++ b/src/security/cert_validators/fake/Makefile.am
@@ -16,12 +16,8 @@ EXTRA_DIST= \
 security_fake_certverify: security_fake_certverify.pl.in
 	$(subst_perlshell)
 
-if ENABLE_POD2MAN_DOC
+if ENABLE_DOCUMENTATION
 man_MANS = security_fake_certverify.8
 CLEANFILES += security_fake_certverify.8
 EXTRA_DIST += security_fake_certverify.8
-
-security_fake_certverify.8: security_fake_certverify
-	pod2man --section=8 security_fake_certverify security_fake_certverify.8
-
 endif
diff --git a/src/security/cert_validators/fake/required.m4 b/src/security/cert_validators/fake/required.m4
index 6c689f6c93d..1fcc7ffac63 100755
--- a/src/security/cert_validators/fake/required.m4
+++ b/src/security/cert_validators/fake/required.m4
@@ -6,7 +6,3 @@
 ##
 
 AS_IF([test "x$PERL" != "x"],[BUILD_HELPER="fake"])
-AS_IF([test "x$POD2MAN" = "x"],[
-  AC_MSG_WARN([pod2man not found. security_fake_certverify man(8) page will not be built])
-])
-
diff --git a/src/store/id_rewriters/file/Makefile.am b/src/store/id_rewriters/file/Makefile.am
index b379d7193d0..d3510a0fb92 100644
--- a/src/store/id_rewriters/file/Makefile.am
+++ b/src/store/id_rewriters/file/Makefile.am
@@ -16,12 +16,8 @@ EXTRA_DIST= \
 storeid_file_rewrite: storeid_file_rewrite.pl.in
 	$(subst_perlshell)
 
-if ENABLE_POD2MAN_DOC
+if ENABLE_DOCUMENTATION
 man_MANS = storeid_file_rewrite.8
 CLEANFILES += storeid_file_rewrite.8
 EXTRA_DIST += storeid_file_rewrite.8
-
-storeid_file_rewrite.8: storeid_file_rewrite
-	pod2man --section=8 storeid_file_rewrite storeid_file_rewrite.8
-
 endif
diff --git a/src/store/id_rewriters/file/required.m4 b/src/store/id_rewriters/file/required.m4
index 780b3be8307..0f288c04c9f 100755
--- a/src/store/id_rewriters/file/required.m4
+++ b/src/store/id_rewriters/file/required.m4
@@ -8,7 +8,3 @@
 if test "x$PERL" != "x"; then
   BUILD_HELPER="file"
 fi
-if test "x$POD2MAN" = "x"; then
-  AC_MSG_WARN([pod2man not found. storeid_file_rewrite man(8) page will not be built])
-fi
-
diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts
index 739df66af31..d6e1bcce0ef 100644
--- a/test-suite/buildtests/layer-01-minimal.opts
+++ b/test-suite/buildtests/layer-01-minimal.opts
@@ -36,6 +36,7 @@ MAKETEST="distcheck"
 DISTCHECK_CONFIGURE_FLAGS=" \
 	--disable-build-info \
 	--disable-shared \
+	--disable-documentation \
 	--disable-xmalloc-statistics \
 	--disable-async-io \
 	--disable-storeio \
diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index fd3408a81ec..568cb0523bd 100644
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -57,6 +57,7 @@ MAKETEST="distcheck"
 #     we use it to perform the same duty between our nested scripts.
 DISTCHECK_CONFIGURE_FLAGS=" \
 	--enable-shared \
+	--enable-documentation \
 	--enable-optimizations \
 	--enable-xmalloc-statistics \
 	--enable-async-io \
diff --git a/test-suite/buildtests/layer-04-noauth-everything.opts b/test-suite/buildtests/layer-04-noauth-everything.opts
index 1f39b33f6c3..a601647a764 100644
--- a/test-suite/buildtests/layer-04-noauth-everything.opts
+++ b/test-suite/buildtests/layer-04-noauth-everything.opts
@@ -55,6 +55,7 @@ MAKETEST="distcheck"
 #     we use it to perform the same duty between our nested scripts.
 DISTCHECK_CONFIGURE_FLAGS=" \
 	--enable-shared \
+	--enable-documentation \
 	--enable-optimizations \
 	--enable-inline \
 	--enable-xmalloc-statistics \
diff --git a/tools/helper-mux/Makefile.am b/tools/helper-mux/Makefile.am
index 027d5f2c964..6e33029fb7c 100644
--- a/tools/helper-mux/Makefile.am
+++ b/tools/helper-mux/Makefile.am
@@ -13,12 +13,8 @@ EXTRA_DIST= helper-mux.pl.in
 helper-mux: helper-mux.pl.in
 	$(subst_perlshell)
 
-if ENABLE_POD2MAN_DOC
+if ENABLE_DOCUMENTATION
 man_MANS = helper-mux.8
 CLEANFILES += helper-mux.8
 EXTRA_DIST += helper-mux.8
-
-helper-mux.8: helper-mux
-	pod2man --section=8 helper-mux helper-mux.8
-
 endif