diff --git a/configure.ac b/configure.ac
index cf373c92..991addf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -581,6 +581,7 @@ fi
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
+	doc/tools/Makefile
 	etc/Makefile
 	src/Makefile
 	src/common/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 370aed86..d572f429 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,32 +1,6 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
+SUBDIRS = tools
+
 dist_noinst_SCRIPTS = html.xsl man.xsl
-dist_noinst_DATA = $(srcdir)/tools/*.xml api.css
-if ENABLE_DOC
-html_DATA = html.out/*
-endif
-
-if ENABLE_MAN
-man1_MANS = man.out/*.1
-man5_MANS = man.out/*.5
-endif
-
-html.out/*: html.out
-html.out:
-	-rm -fr html.tmp html.out
-	$(MKDIR_P) html.tmp
-	$(XSLTPROC) --nonet --path "$(srcdir):$(xslstylesheetsdir)/html" --xinclude -o "html.tmp/tools.html" "html.xsl" "$(srcdir)/tools/tools.xml"
-	mv html.tmp html.out
-
-man.out/*.1: man.out
-man.out:
-	-rm -fr man.tmp man.out
-	$(MKDIR_P) man.tmp
-	$(XSLTPROC) --nonet --path "$(srcdir):$(xslstylesheetsdir)/manpages" --xinclude -o "man.tmp/" "man.xsl" "$(srcdir)/tools/tools.xml"
-	mv man.tmp man.out
-
-man.out/*.5:	man.out/*.1
-
-
-clean-local:
-	-rm -fr html.tmp man.tmp html.out man.out
+dist_noinst_DATA = api.css
diff --git a/doc/tools/Makefile.am b/doc/tools/Makefile.am
new file mode 100644
index 00000000..7873d263
--- /dev/null
+++ b/doc/tools/Makefile.am
@@ -0,0 +1,23 @@
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+
+dist_noinst_DATA = $(wildcard $(srcdir)/*.xml)
+if ENABLE_DOC
+html_DATA = tools.html
+endif
+
+if ENABLE_MAN
+man1_MANS = $(patsubst $(srcdir)/%.xml, %, $(wildcard $(srcdir)/*.1.xml))
+man5_MANS = $(patsubst $(srcdir)/%.xml, %, $(wildcard $(srcdir)/*.5.xml))
+endif
+
+tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml) $(wildcard $(srcdir)/*.5.xml)
+	$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $<
+
+%.1: $(srcdir)/%.1.xml
+	$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl $<
+
+%.5: $(srcdir)/%.5.xml
+	$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/manpages" --xinclude -o $@ man.xsl $<
+
+clean-local:
+	-rm -rf $(html_DATA) $(man1_MANS) $(man5_MANS)