diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile
index 7d0d9db7f1..0a31c36f8f 100644
--- a/DOCS/xml/Makefile
+++ b/DOCS/xml/Makefile
@@ -3,62 +3,61 @@
 # List of subdirectories to be processed.
 SUBDIRS = en fr es ru pl
 
-# Generated HTML files go here.
-HTML_TOP = ../HTML
+# Generated chunked HTML files go here.
+HTML_CHUNKED = ../HTML
 
-# Here go unchunked files (all DOCS in single HTML file)
-HTML_UNCHUNKED = ../HTML-single
+# Generated single HTML files go here.
+HTML_SINGLE = ../HTML-single
 
 .PHONY: all
-all: build-html build-html-chunked
+all: build-html-chunked build-html-single
 
 .PHONY: help
 help:
 	@echo "Targets:"
 	@echo "********"
-	@echo "all               : Build everything"
-	@echo "                    (same as build-html and build-html-chunked for now)."
-	@echo "build-html        : Build HTML documentation (single file)."
+	@echo "all               : Build everything (default)."
+	@echo "build-html-single : Build HTML documentation (single file)."
 	@echo "build-html-chunked: Build HTML documentation (multiple files)."
-	@echo "clean-html        : Purge the 'HTML-single' directory."
+	@echo "clean-html-single : Purge the 'HTML-single' directory."
 	@echo "clean-html-chunked: Purge the 'HTML' directory."
 	@echo "distclean         : Remove ALL generated files."
 
 .PHONY: build-html-chunked
 build-html-chunked: xsltproc.sh
-	test -d $(HTML_TOP) || mkdir $(HTML_TOP)
+	test -d $(HTML_CHUNKED) || mkdir $(HTML_CHUNKED)
 	for dir in $(SUBDIRS); do\
 		test -f $$dir/Makefile &&\
-		(test -d $(HTML_TOP)/$$dir || mkdir $(HTML_TOP)/$$dir) &&\
-		if $(MAKE) HTMLDIR=../$(HTML_TOP)/$$dir -C $$dir html-chunked; then :; else exit 1; fi;\
+		(test -d $(HTML_CHUNKED)/$$dir || mkdir $(HTML_CHUNKED)/$$dir) &&\
+		if $(MAKE) HTMLDIR=../$(HTML_CHUNKED)/$$dir -C $$dir html-chunked; then :; else exit 1; fi;\
 	done
 
-.PHONY: build-html
-build-html: xsltproc.sh
-	test -d $(HTML_TOP) || mkdir $(HTML_TOP)
-	test -d $(HTML_UNCHUNKED) || mkdir $(HTML_UNCHUNKED)
+.PHONY: build-html-single
+build-html-single: xsltproc.sh
+	test -d $(HTML_SINGLE) || mkdir $(HTML_SINGLE)
 	for dir in $(SUBDIRS); do\
 		test -f $$dir/Makefile &&\
-		if $(MAKE) HTMLFILE=../$(HTML_UNCHUNKED)/mplayer_docs_$$dir.html -C $$dir html; then :; else exit 1; fi;\
+		(test -d $(HTML_SINGLE)/$$dir || mkdir $(HTML_SINGLE)/$$dir) &&\
+		if $(MAKE) HTMLFILE=../$(HTML_SINGLE)/$$dir/MPlayer.html -C $$dir html; then :; else exit 1; fi;\
 	done
 
 .PHONY: clean-html-chunked
-clean-html:
-	-rm -rf $(HTML_TOP)
+clean-html-chunked:
+	-rm -rf $(HTML_CHUNKED)
 
-.PHONY: clean-html
-clean-html:
-	-rm -rf $(HTML_UNCHUNKED)
+.PHONY: clean-html-single
+clean-html-single:
+	-rm -rf $(HTML_SINGLE)
 
 .PHONY: distclean
-distclean: clean-html clean-html-chunked
+distclean: clean-html-chunked clean-html-single
 	for dir in $(SUBDIRS); do\
 		test -f $$dir/Makefile &&\
-		if $(MAKE) HTMLDIR=../$(HTML_TOP)/$$dir -C $$dir distclean ; then :; else exit 1; fi;\
+		if $(MAKE) HTMLDIR=../$(HTML_CHUNKED)/$$dir -C $$dir distclean ; then :; else exit 1; fi;\
 	done
 	-rm -f html.xsl html-chunk.xsl xsltproc.sh xmllint.sh
 
 xsltproc.sh: configure
 	./configure
 
-clean: clean-html
+clean: clean-html-chunked clean-html-single