diff --git a/doc/Makefile.am b/doc/Makefile.am
index f2c7264e23fb685f93e68bedf871785210ee812f_ZG9jL01ha2VmaWxlLmFt..cebc84b4554d8234420636e087bd81ad1d93918f_ZG9jL01ha2VmaWxlLmFt 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,21 +5,7 @@
 # A file in win32 depends upon two of the doc files
 WIN32_DIR=$(top_srcdir)/win32
 
-EXTRA_DIST =				\
-	EXSLT/libexslt-api.xml		\
-	EXSLT/libexslt-refs.xml		\
-	apibuild.py			\
-	checkapisym.xsl			\
-	libxslt-api.xml			\
-	libxslt-refs.xml		\
-	symbols.xml			\
-	syms.xsl			\
-	tutorial/libxslttutorial.xml	\
-	tutorial2/libxslt_pipes.xml	\
-	xsltproc.1			\
-	xsltproc.xml
-
-nobase_doc_DATA =			\
+nobase_dist_doc_DATA =			\
 	tutorial/images/callouts/1.png	\
 	tutorial/images/callouts/10.png	\
 	tutorial/images/callouts/2.png	\
@@ -36,10 +22,25 @@
 	tutorial2/libxslt_pipes.html	\
 	xsltproc.html
 
-man_MANS = xsltproc.1
+dist_man_MANS = xsltproc.1
+
+EXTRA_DIST =				\
+	EXSLT/libexslt-api.xml		\
+	EXSLT/libexslt-refs.xml		\
+	apibuild.py			\
+	checkapisym.xsl			\
+	libxslt-api.xml			\
+	libxslt-refs.xml		\
+	symbols.xml			\
+	syms.xsl			\
+	tutorial/libxslttutorial.xml	\
+	tutorial2/libxslt_pipes.xml	\
+	xsltproc.xml
+
+DOCBOOK_HTML = http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
 
 rebuild:
 	cd $(srcdir) && ./apibuild.py
 	cd $(srcdir) && $(XSLTPROC) checkapisym.xsl libxslt-api.xml
 	cd $(srcdir) && $(XSLTPROC) -o ../libxslt/libxslt.syms syms.xsl symbols.xml
 	cd $(srcdir) && $(XSLTPROC) --nonet xsltproc.xml
@@ -40,12 +41,12 @@
 
 rebuild:
 	cd $(srcdir) && ./apibuild.py
 	cd $(srcdir) && $(XSLTPROC) checkapisym.xsl libxslt-api.xml
 	cd $(srcdir) && $(XSLTPROC) -o ../libxslt/libxslt.syms syms.xsl symbols.xml
 	cd $(srcdir) && $(XSLTPROC) --nonet xsltproc.xml
-	cd $(srcdir) && $(XSLTPROC) --nonet -o xsltproc.html http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl xsltproc.xml
+	cd $(srcdir) && $(XSLTPROC) --nonet -o xsltproc.html $(DOCBOOK_HTML) xsltproc.xml
 	cd $(srcdir) && $(XSLTPROC) -o $(WIN32_DIR)/libxslt.def.src \
 	  --nonet $(WIN32_DIR)/defgen.xsl libxslt-api.xml
 	cd $(srcdir) && $(XSLTPROC) -o $(WIN32_DIR)/libexslt.def.src \
 	  --nonet $(WIN32_DIR)/defgen.xsl EXSLT/libexslt-api.xml
 
@@ -47,30 +48,6 @@
 	cd $(srcdir) && $(XSLTPROC) -o $(WIN32_DIR)/libxslt.def.src \
 	  --nonet $(WIN32_DIR)/defgen.xsl libxslt-api.xml
 	cd $(srcdir) && $(XSLTPROC) -o $(WIN32_DIR)/libexslt.def.src \
 	  --nonet $(WIN32_DIR)/defgen.xsl EXSLT/libexslt-api.xml
 
-wildcards =				\
-	*.1				\
-	*.html				\
-	*.xsl				\
-	tutorial/images/callouts/*.png	\
-	tutorial*/libxslt*
-
-# This target verifies that EXTRA_DIST contains all the files matched by
-# the above list of wildcards. Note that this will only work properly when
-# srcdir = builddir.
-#
-check-extra-dist:
-	@for a in $(wildcards) ; do \
-		if test ! -f "$$a" ; then \
-			echo "not found: $$a" ; \
-			continue ; \
-		fi ; \
-		present= ; \
-		for b in $(EXTRA_DIST) ; do \
-			test "$$a" = "$$b" && present=1 && break ; \
-		done ; \
-		test -n "$$present" || echo "not in EXTRA_DIST: $$a" ; \
-	done
-
-.PHONY : rebuild check-extra-dist
+.PHONY: rebuild