diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 72cdbebf42..acd0fa985d 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -56,9 +56,7 @@
 
 MASTERDOC?=	${.CURDIR}/${DOC}.xml
 
-XMLDECL?=	/usr/local/share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl
-
-XSLPROF?=	/usr/local/share/xsl/docbook/profiling/profile.xsl
+XSLPROF?=	/usr/local/share/xsl/docbook-ns/profiling/profile.xsl
 XSLXHTML?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml.xsl
 XSLXHTMLCHUNK?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml-chunk.xsl
 XSLEPUB?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-epub.xsl
diff --git a/share/xsl/freebsd-epub.xsl b/share/xsl/freebsd-epub.xsl
index 1a48cb7164..98fcddc1d6 100644
--- a/share/xsl/freebsd-epub.xsl
+++ b/share/xsl/freebsd-epub.xsl
@@ -8,7 +8,7 @@
                 exclude-result-prefixes="#default">
 
   <!-- Pull in the base stylesheets -->
-  <xsl:import href="/usr/local/share/xsl/docbook/epub/docbook.xsl"/>
+  <xsl:import href="/usr/local/share/xsl/docbook-ns/epub/docbook.xsl"/>
 
   <!-- Pull in common XHTML customizations -->
   <xsl:include href="freebsd-xhtml-common.xsl"/>
diff --git a/share/xsl/freebsd-fo.xsl b/share/xsl/freebsd-fo.xsl
index a21ff9080b..1a0dbf43a2 100644
--- a/share/xsl/freebsd-fo.xsl
+++ b/share/xsl/freebsd-fo.xsl
@@ -9,7 +9,7 @@
                 exclude-result-prefixes="#default">
 
   <!-- Pull in the base stylesheets -->
-  <xsl:import href="/usr/local/share/xsl/docbook/fo/docbook.xsl"/>
+  <xsl:import href="/usr/local/share/xsl/docbook-ns/fo/docbook.xsl"/>
 
   <!-- Include the common customizations -->
   <xsl:include href="freebsd-common.xsl"/>
diff --git a/share/xsl/freebsd-xhtml-chunk.xsl b/share/xsl/freebsd-xhtml-chunk.xsl
index b2588ead7c..df25703c2a 100644
--- a/share/xsl/freebsd-xhtml-chunk.xsl
+++ b/share/xsl/freebsd-xhtml-chunk.xsl
@@ -8,7 +8,7 @@
                 exclude-result-prefixes="#default">
 
   <!-- Pull in the base stylesheets -->
-  <xsl:import href="/usr/local/share/xsl/docbook/xhtml/chunk.xsl"/>
+  <xsl:import href="/usr/local/share/xsl/docbook-ns/xhtml/chunk.xsl"/>
 
   <!-- Pull in common XHTML customizations -->
   <xsl:include href="freebsd-xhtml-common.xsl"/>
diff --git a/share/xsl/freebsd-xhtml.xsl b/share/xsl/freebsd-xhtml.xsl
index 9b5a37fe8e..e826e0e885 100644
--- a/share/xsl/freebsd-xhtml.xsl
+++ b/share/xsl/freebsd-xhtml.xsl
@@ -8,7 +8,7 @@
                 exclude-result-prefixes="#default">
 
   <!-- Pull in the base stylesheets -->
-  <xsl:import href="/usr/local/share/xsl/docbook/xhtml/docbook.xsl"/>
+  <xsl:import href="/usr/local/share/xsl/docbook-ns/xhtml/docbook.xsl"/>
 
   <!-- Pull in common XHTML customizations -->
   <xsl:include href="freebsd-xhtml-common.xsl"/>
diff --git a/share/xsl/titlepage.templates.xml b/share/xsl/titlepage.templates.xml
index af592b0552..736c8101b5 100644
--- a/share/xsl/titlepage.templates.xml
+++ b/share/xsl/titlepage.templates.xml
@@ -10,7 +10,7 @@
 	Use this template to generate freebsd-xhtml-titlepage.xsl by
 	running:
 
-	 xsltproc /usr/local/share/xsl/docbook/template/titlepage.xsl titlepage.templates.xml > freebsd-xhtml-titlepage.xsl
+	 xsltproc /usr/local/share/xsl/docbook-ns/template/titlepage.xsl titlepage.templates.xml > freebsd-xhtml-titlepage.xsl
 
 -->