diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 35c34f3279..c0cdf8c470 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -23,7 +23,7 @@ dependencies {
             fopDeps
 
     runtime 'net.sf.xslthl:xslthl:2.0.1',
-            'net.sf.docbook:docbook-xsl:1.75.2:resources@zip'
+            'net.sf.docbook:docbook-xsl:1.75.2:ns-resources@zip'
 }
 
 task ide(type: Copy)  {
diff --git a/docs/faq/src/xsl/html-single-custom.xsl b/docs/faq/src/xsl/html-single-custom.xsl
index cb728e04b4..a48351ef4c 100644
--- a/docs/faq/src/xsl/html-single-custom.xsl
+++ b/docs/faq/src/xsl/html-single-custom.xsl
@@ -5,8 +5,8 @@
                 exclude-result-prefixes="xslthl"
                 version='1.0'>
 
-    <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
-    <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/highlight.xsl"/>
+    <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/>
+    <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/highlight.xsl"/>
 
     <!-- Use code syntax highlighting -->
     <xsl:param name="highlight.source">1</xsl:param>
diff --git a/docs/manual/src/xsl/html-custom.xsl b/docs/manual/src/xsl/html-custom.xsl
index 76e6fb0bbe..5c11bc7931 100644
--- a/docs/manual/src/xsl/html-custom.xsl
+++ b/docs/manual/src/xsl/html-custom.xsl
@@ -24,8 +24,8 @@
 				exclude-result-prefixes="xslthl"
 				version='1.0'>
 
-    <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>	
-	<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/highlight.xsl"/>
+    <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/chunk.xsl"/>
+	<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/highlight.xsl"/>
 	
 	<xsl:param name="chunk.section.depth">'5'</xsl:param>
 	<xsl:param name="use.id.as.filename">'1'</xsl:param>
diff --git a/docs/manual/src/xsl/html-single-custom.xsl b/docs/manual/src/xsl/html-single-custom.xsl
index 63ccaaff6c..e979e7f146 100644
--- a/docs/manual/src/xsl/html-single-custom.xsl
+++ b/docs/manual/src/xsl/html-single-custom.xsl
@@ -24,8 +24,8 @@
                 exclude-result-prefixes="xslthl"
                 version='1.0'>
 
-    <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
-    <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/highlight.xsl"/>
+    <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/>
+    <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/highlight.xsl"/>
 
     <!-- Only use scaling in FO -->
     <xsl:param name="ignore.image.scaling">1</xsl:param>
diff --git a/docs/manual/src/xsl/pdf-custom.xsl b/docs/manual/src/xsl/pdf-custom.xsl
index 7de82b2546..08882ffc06 100644
--- a/docs/manual/src/xsl/pdf-custom.xsl
+++ b/docs/manual/src/xsl/pdf-custom.xsl
@@ -22,10 +22,11 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 xmlns:xslthl="http://xslthl.sf.net"
-                exclude-result-prefixes="xslthl"
+                xmlns:d="http://docbook.org/ns/docbook"
+                exclude-result-prefixes="d xslthl"
                 version='1.0'>
-    <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
-    <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/highlight.xsl"/>
+    <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/fo/docbook.xsl"/>
+    <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/fo/highlight.xsl"/>
 
     <!-- xsl:param name="draft.watermark.image" select="'images/draft.png'"/ -->
     <xsl:param name="paper.type" select="'A4'"/>
@@ -75,8 +76,8 @@
 
         <xsl:variable name="Version">
             <xsl:choose>
-                <xsl:when test="//productname">
-                    <xsl:value-of select="//productname"/><xsl:text> </xsl:text>
+                <xsl:when test="//d:productname">
+                    <xsl:value-of select="//d:productname"/><xsl:text> </xsl:text>
                 </xsl:when>
                 <xsl:otherwise>
                     <xsl:text>please define productname in your docbook file!</xsl:text>
@@ -120,8 +121,8 @@
 
         <xsl:variable name="Version">
             <xsl:choose>
-                <xsl:when test="//releaseinfo">
-                    <xsl:value-of select="//releaseinfo"/>
+                <xsl:when test="//d:releaseinfo">
+                    <xsl:value-of select="//d:releaseinfo"/>
                 </xsl:when>
                 <xsl:otherwise>
                 </xsl:otherwise>
@@ -232,7 +233,7 @@
 
 <!-- Why is the font-size for chapters hardcoded in the XSL FO templates?
     Let's remove it, so this sucker can use our attribute-set only... -->
-    <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
+    <xsl:template match="d:title" mode="chapter.titlepage.recto.auto.mode">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 xsl:use-attribute-sets="chapter.titlepage.recto.style">
             <xsl:call-template name="component.title">