diff --git a/docs/Makefile.in b/docs/Makefile.in
index d3993e44ae2..f7e91d0183b 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -157,7 +157,6 @@ clean:
 	rm -f Samba-Developers-Guide.*
 	rm -f Samba-Guide.*
 	rm -f $(IMAGEPROJDIR)/*.eps $(MANPAGEDIR)/smb.conf.5.xml
-	rm -f $(PLUCKERDIR)/*.pdb
 
 # Text files
 $(TXTDIR):
diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index 8db39b56e8c..dfdc2401808 100644
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -14,7 +14,7 @@
 
 	<xsl:import href="../settings.xsl"/>
 
-	<xsl:output method="xml"/>
+	<xsl:output method="xml" encoding="UTF-8" doctype-public="-//OASIS//DTD DocBook XML V4.2//EN" indent="yes" doctype-system="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>
 
 	<xsl:param name="xmlSambaNsUri" select="'http://samba.org/common'"/>
 
@@ -70,20 +70,6 @@
 		</xsl:element>
 	</xsl:template>
 
-	<xsl:template match="/node()">
-		<xsl:text disable-output-escaping="yes">
-			&lt;!DOCTYPE </xsl:text><xsl:value-of select="name(.)"/><xsl:text disable-output-escaping="yes"> PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-			"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-			&lt;!ENTITY % globalentities SYSTEM 'entities/global.entities'> %globalentities;
-			]>
-		</xsl:text>
-		<xsl:copy>
-			<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-			<xsl:apply-templates/>
-		</xsl:copy>
-	</xsl:template>
-
 
 	<!-- This is needed to copy content unchanged -->
 	<xsl:template match="@*|node()">
diff --git a/docs/xslt/generate-attributions.xsl b/docs/xslt/generate-attributions.xsl
index 79bf9425044..d358f1c59e1 100644
--- a/docs/xslt/generate-attributions.xsl
+++ b/docs/xslt/generate-attributions.xsl
@@ -9,7 +9,7 @@
 				version="1.1"
                 extension-element-prefixes="exsl">
 
-<xsl:output method="xml" omit-xml-declaration="yes"/>
+<xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
 
 <!-- Remove all character data -->
 <xsl:template match="@*|node()">