diff --git a/Makefile.docs b/Makefile.docs
index 8fe3114dbc..3b2700687b 100644
--- a/Makefile.docs
+++ b/Makefile.docs
@@ -10,6 +10,7 @@ AM_V_SPHINX_0 = @echo "  SPHINX   $@";
 SPHINXBUILDDIR = $(builddir)/_build
 
 common_SPHINXOPTS =			\
+	-W				\
 	-c $(srcdir)			\
 	-a				\
 	$(SPHINX_V)
diff --git a/bin/confgen/tsig-keygen.rst b/bin/confgen/tsig-keygen.rst
index 2819d09d85..0d709b4122 100644
--- a/bin/confgen/tsig-keygen.rst
+++ b/bin/confgen/tsig-keygen.rst
@@ -21,8 +21,6 @@
 
 .. highlight: console
 
-.. _man_tsig-keygen:
-
 tsig-keygen, ddns-confgen - TSIG key generation tool
 ----------------------------------------------------
 
diff --git a/doc/arm/Makefile.am b/doc/arm/Makefile.am
index 26b64f7231..31a06ebd29 100644
--- a/doc/arm/Makefile.am
+++ b/doc/arm/Makefile.am
@@ -48,7 +48,7 @@ EXTRA_DIST =					\
 	../notes/*.rst
 
 html-local:
-	$(AM_V_SPHINX)$(SPHINX_BUILD) -b html -d $(SPHINXBUILDDIR)/doctrees $(ALLSPHINXOPTS) $(SPHINXBUILDDIR)/html
+	$(AM_V_SPHINX)$(SPHINX_BUILD) -b html -d $(SPHINXBUILDDIR)/.doctrees/html $(ALLSPHINXOPTS) $(SPHINXBUILDDIR)/html
 
 install-html-local:
 	$(INSTALL) -d $(DESTDIR)/$(docdir) $(DESTDIR)/$(docdir)/_static
@@ -56,7 +56,7 @@ install-html-local:
 	cp -R $(SPHINXBUILDDIR)/html/_static/ $(DESTDIR)/$(docdir)/_static/
 
 singlehtml:
-	$(AM_V_SPHINX)$(SPHINX_BUILD) -b singlehtml -d $(SPHINXBUILDDIR)/doctrees $(ALLSPHINXOPTS) $(SPHINXBUILDDIR)/singlehtml
+	$(AM_V_SPHINX)$(SPHINX_BUILD) -b singlehtml -d $(SPHINXBUILDDIR)/.doctrees/singlehtml $(ALLSPHINXOPTS) $(SPHINXBUILDDIR)/singlehtml
 
 install-singlehtml: singlehtml
 	$(INSTALL) -d $(DESTDIR)/$(docdir) $(DESTDIR)/$(docdir)/_static
@@ -64,7 +64,7 @@ install-singlehtml: singlehtml
 	cp -R $(SPHINXBUILDDIR)/singlehtml/_static/* $(DESTDIR)/$(docdir)/_static/
 
 epub:
-	$(AM_V_SPHINX)$(SPHINX_BUILD) -b epub -A today=$(RELEASE_DATE) -d $(SPHINXBUILDDIR)/doctrees $(ALLSPHINXOPTS) $(SPHINXBUILDDIR)/epub
+	$(AM_V_SPHINX)$(SPHINX_BUILD) -b epub -A today=$(RELEASE_DATE) -d $(SPHINXBUILDDIR)/.doctrees/epub $(ALLSPHINXOPTS) $(SPHINXBUILDDIR)/epub
 
 install-epub:
 	$(INSTALL) -d $(DESTDIR)/$(docdir)
@@ -72,7 +72,7 @@ install-epub:
 
 if HAVE_XELATEX
 pdf-local:
-	$(AM_V_SPHINX)$(SPHINX_BUILD) -b latex -d $(SPHINXBUILDDIR)/doctrees $(ALLSPHINXOPTS) $(SPHINXBUILDDIR)/latex
+	$(AM_V_SPHINX)$(SPHINX_BUILD) -b latex -d $(SPHINXBUILDDIR)/.doctrees/latex $(ALLSPHINXOPTS) $(SPHINXBUILDDIR)/latex
 	$(MAKE) -C $(SPHINXBUILDDIR)/latex all-pdf
 
 install-pdf-local:
diff --git a/doc/arm/advanced.rst b/doc/arm/advanced.rst
index 82106e6804..b82887aa27 100644
--- a/doc/arm/advanced.rst
+++ b/doc/arm/advanced.rst
@@ -416,7 +416,8 @@ email, etc.)
 
 ``tsig-keygen`` can also be run as ``ddns-confgen``, in which case its
 output includes additional configuration text for setting up dynamic DNS
-in ``named``. See :ref:`man_tsig-keygen` for details.
+in ``named``. See :ref:`tsig-keygen, ddns-confgen - TSIG key generation
+tool <man_tsig-keygen_ddns-confgen>` for details.
 
 Loading a New Key
 ~~~~~~~~~~~~~~~~~
diff --git a/doc/arm/manpages.rst b/doc/arm/manpages.rst
index 30996a16ab..01f610beb4 100644
--- a/doc/arm/manpages.rst
+++ b/doc/arm/manpages.rst
@@ -46,4 +46,5 @@ Manual Pages
 .. include:: ../../bin/confgen/rndc-confgen.rst
 .. include:: ../../bin/rndc/rndc.conf.rst
 .. include:: ../../bin/rndc/rndc.rst
+.. _man_tsig-keygen_ddns-confgen:
 .. include:: ../../bin/confgen/tsig-keygen.rst
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index f11a46fd82..d363e35355 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -169,7 +169,7 @@ if HAVE_SPHINX_BUILD
 manpages.stamp: $(MANPAGES_RST)
 	@rm -f manpages.tmp
 	@touch manpages.tmp
-	$(AM_V_SPHINX)$(SPHINX_BUILD) -b man -d $(SPHINXBUILDDIR)/doctrees $(man_SPHINXOPTS) $(SPHINXBUILDDIR)/man
+	$(AM_V_SPHINX)$(SPHINX_BUILD) -b man -d $(SPHINXBUILDDIR)/.doctrees/man $(man_SPHINXOPTS) $(SPHINXBUILDDIR)/man
 	for f in $(SPHINXBUILDDIR)/man/*; do \
 	  cp -a "$$f" "$(srcdir)/$$(basename $$f)in"; \
 	done