Index: /trunk/doc/manual/Config.kmk
===================================================================
--- /trunk/doc/manual/Config.kmk	(revision 86657)
+++ /trunk/doc/manual/Config.kmk	(revision 86658)
@@ -272,5 +272,4 @@
 		'  <system systemId="$(VBOX_PATH_MANUAL_SRC)/html/docbook.xsl"                              uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DOCBOOK)/html/docbook.xsl"/>' \
 		'  <system systemId="$(VBOX_PATH_MANUAL_SRC)/html/chunk.xsl"                                uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DOCBOOK)/html/chunk.xsl"/>' \
-		'  <system systemId="$(VBOX_PATH_MANUAL_SRC)/xhtml/docbook.xsl"                              uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DOCBOOK)/xhtml/docbook.xsl"/>' \
 		'  <system systemId="$(VBOX_PATH_MANUAL_SRC)/htmlhelp/htmlhelp.xsl"                         uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DOCBOOK)/htmlhelp/htmlhelp.xsl"/>' \
 		'  <system systemId="$(VBOX_PATH_MANUAL_SRC)/manpages/docbook.xsl"                          uri="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_DOCBOOK)/manpages/docbook.xsl"/>' \
Index: /trunk/doc/manual/Makefile.kmk
===================================================================
--- /trunk/doc/manual/Makefile.kmk	(revision 86657)
+++ /trunk/doc/manual/Makefile.kmk	(revision 86658)
@@ -260,5 +260,5 @@
         $(notdir $(VBOX_MANUAL_TEX_UNICODE_FILES)) \
         $(addprefix HTMLHelp/,$(VBOX_MANUAL_PNG_FILES_$(lang))) \
-        html-single/UserManual.xhtml \
+        html-single/UserManual.html \
         html-single/UserManual.qhp \
         html-single/UserManual.qhcp \
@@ -785,5 +785,5 @@
 ##########################################################################################
 #
-#  UserManual.xhtml
+#  UserManual.html
 #
 ##########################################################################################
@@ -793,5 +793,5 @@
 	$(VBOX_PATH_MANUAL_SRC)/common-html-formatcfg.xsl
 
-$(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.xhtml: \
+$(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html: \
 		$(addprefix $(VBOX_PATH_MANUAL_SRC)/en_US/,$(VBOX_MANUAL_XML_FILES)) \
 		$(VBOX_MANUAL_XML_FILES_COMMON) \
@@ -804,5 +804,5 @@
 	$(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(firstword $(filter %.xml,$^)),$@)
 	$(QUIET)$(call VBOX_XSLTPROC_WITH_CAT) \
-		--output $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.xhtml \
+		--output $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html \
 		$(VBOX_PATH_MANUAL_SRC)/docbook-html-one-page-formatcfg.xsl \
 		$<
@@ -830,5 +830,5 @@
 
 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.zip: \
-		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.xhtml \
+		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html \
 		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-chunks/index.html \
         $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_MANUAL_PNG_FILES_en_US))
@@ -838,5 +838,5 @@
 		-9 -r $@ html-single html-chunks $(VBOX_MANUAL_PNG_FILES_en_US)
 
-html:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.xhtml
+html:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html
 html:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-chunks/index.html
 qhelp:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.qhc
Index: /trunk/doc/manual/docbook-html-one-page-formatcfg.xsl
===================================================================
--- /trunk/doc/manual/docbook-html-one-page-formatcfg.xsl	(revision 86657)
+++ /trunk/doc/manual/docbook-html-one-page-formatcfg.xsl	(revision 86658)
@@ -3,5 +3,5 @@
 
 <!-- Single html file template -->
-<xsl:import href="xhtml/docbook.xsl"/>
+<xsl:import href="html/docbook.xsl"/>
 
 <xsl:import href="common-formatcfg.xsl"/>