diff --git a/doc/Makefile b/doc/Makefile
index c8d8502f..6ce38a6c 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -92,6 +92,8 @@ all-docs: man-docs html-docs pdf-docs
 ### Build Rules
 #
 
+$(MAKECMDGOALS): doc-dirs
+
 doc-dirs:
 	$(INSTALL) -d $(DOC_DIRS)
 
@@ -102,36 +104,36 @@ clean-local:
 
 # Autogenerated asciidoc files.
 
-$(TXT_DIR)/import-features.conf.txt: $(FEATURES) doc-dirs $(IMPORT_FEATURES_CONF)
+$(TXT_DIR)/import-features.conf.txt: $(FEATURES) $(IMPORT_FEATURES_CONF)
 	$(IMPORT_FEATURES_CONF) > $@
 
-$(TXT_DIR)/elinks.1.%.txt: $(MAKE_ELINKS_MANPAGE) doc-dirs $(ELINKS)
+$(TXT_DIR)/elinks.1.%.txt: $(MAKE_ELINKS_MANPAGE) $(ELINKS)
 	$(MAKE_ELINKS_MANPAGE) $@ $(ELINKS) $(HELP2DOC) > $@
 
-$(TXT_DIR)/elinkskeys.5.%.txt: $(MAKE_ELINKSKEYS_MANPAGE) doc-dirs $(KBDBIND)
+$(TXT_DIR)/elinkskeys.5.%.txt: $(MAKE_ELINKSKEYS_MANPAGE) $(KBDBIND)
 	$(MAKE_ELINKSKEYS_MANPAGE) $@ $(KBDBIND) > $@
 
 
 # Man Pages
 
-$(XML_DIR)/%.man.xml: $(TXT_DIR)/%.man.txt doc-dirs
+$(XML_DIR)/%.man.xml: $(TXT_DIR)/%.man.txt
 	$(ASCIIDOC) -b docbook -d manpage -o $@ $<
 
-$(MAN_DIR)/man1/elinks.1.in: $(XML_DIR)/elinks.1.man.xml doc-dirs
+$(MAN_DIR)/man1/elinks.1.in: $(XML_DIR)/elinks.1.man.xml
 	$(XMLTO) -o $(MAN_DIR)/man1 man $<
 	mv $(MAN_DIR)/man1/elinks.1 $@
 
-$(MAN_DIR)/man5/elinkskeys.5: $(XML_DIR)/elinkskeys.5.man.xml doc-dirs
+$(MAN_DIR)/man5/elinkskeys.5: $(XML_DIR)/elinkskeys.5.man.xml
 	$(XMLTO) -o $(MAN_DIR)/man5 man $<
 	sed -e 's/\\fI\\fR'\''/\\fI\\'\''\\fR/' < $@ > $@.tmp
 	mv $@.tmp $@
 
-$(MAN_DIR)/man5/elinks.conf.5: doc-dirs $(ELINKS)
+$(MAN_DIR)/man5/elinks.conf.5: $(ELINKS)
 	$(HELP2DOC) --elinks=$(ELINKS) --elinksconf > $@
 
 # XHTML/CSS Man Pages
 
-$(HTML_DIR)/%.html: $(TXT_DIR)/%.html.txt doc-dirs
+$(HTML_DIR)/%.html: $(TXT_DIR)/%.html.txt
 	$(ASCIIDOC) -b xhtml11 -d manpage -o $@ $<
 
 # The Manual
@@ -141,28 +143,28 @@ MANUAL_EXTRA_FILES = \
  $(TXT_DIR)/elinks.1.html.txt \
  $(TXT_DIR)/elinkskeys.5.html.txt
 
-$(HTML_DIR)/manual.html: $(MANUAL_FILES) doc-dirs $(MANUAL_EXTRA_FILES)
+$(HTML_DIR)/manual.html: $(MANUAL_FILES) $(MANUAL_EXTRA_FILES)
 	$(ASCIIDOC) -b xhtml11 -d book -o $@ -n $<
 
-$(HTML_DIR)/hacking.html: $(top_srcdir)/doc/hacking.txt doc-dirs
+$(HTML_DIR)/hacking.html: $(top_srcdir)/doc/hacking.txt
 	$(ASCIIDOC) -b xhtml11 -d book -o $@ -n $<
 
-$(HTML_DIR)/dev-intro.html: $(top_srcdir)/doc/dev-intro.txt doc-dirs
+$(HTML_DIR)/dev-intro.html: $(top_srcdir)/doc/dev-intro.txt
 	$(ASCIIDOC) -b xhtml11 -d book -o $@ -n $<
 
-$(XML_DIR)/manual.xml: $(MANUAL_FILES) doc-dirs $(MANUAL_EXTRA_FILES)
+$(XML_DIR)/manual.xml: $(MANUAL_FILES) $(MANUAL_EXTRA_FILES)
 	$(ASCIIDOC) -b docbook -d book -o $@ $<
 
-$(HTML_DIR)/manual.html-chunked: $(XML_DIR)/manual.xml doc-dirs
+$(HTML_DIR)/manual.html-chunked: $(XML_DIR)/manual.xml
 	$(XMLTO) -o $@ html $<
 
-$(PDF_DIR)/manual.pdf: $(XML_DIR)/manual.xml doc-dirs
+$(PDF_DIR)/manual.pdf: $(XML_DIR)/manual.xml
 	$(JW) -o $(PDF_DIR) -b pdf $<
 
-$(HTML_DIR)/perl.html: $(top_srcdir)/doc/perl.pod doc-dirs
+$(HTML_DIR)/perl.html: $(top_srcdir)/doc/perl.pod
 	$(POD2HTML) --outfile=$@ < $<
 
-$(HTML_DIR)/perl-hooks.html: $(top_srcdir)/contrib/perl/hooks.pl doc-dirs
+$(HTML_DIR)/perl-hooks.html: $(top_srcdir)/contrib/perl/hooks.pl
 	$(POD2HTML) --outfile=$@ < $<
 
 include $(top_srcdir)/Makefile.lib