diff --git a/Doc/Makefile b/Doc/Makefile
index 11e02ce28ce67dadd3e115eb94fbe09553ebead6..b5f7560869d2e6a453503d4d47d3d089f722ffd0 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -61,12 +61,12 @@ set       toc,title' \
 webhelp.base.dir=.
 
 # Required for docbook Xsl 1.0 based stylesheets
-SAXON6CMD=java -cp "${DBOOK_XSL}/tools/lib/saxon.jar:${DBOOK_XSL}/extensions/saxon65.jar:${DBOOK_XSL}/lib/xslthl-2.1.3.jar" \
+SAXON6CMD=java -cp "${DBOOK_XSL}/extensions/saxon65.jar:${DBOOK_XSL}/tools/lib/saxon.jar:${DBOOK}/lib/xslthl-2.1.3.jar" \
           '-Dxslthl.config=file://${DBOOK_XSL}/highlighting/xslthl-config.xml' \
           com.icl.saxon.StyleSheet
 
 # XSL 2.0 processor
-SAXONCMD=java -cp "${DBOOK_XSL}/tools/lib/saxon9he.jar:/usr/share/java/xercesImpl.jar:${DBOOK_XSL}/lib/xslthl-2.1.3.jar" \
+SAXONCMD=java -cp "${DBOOK_XSL}/tools/lib/saxon9he.jar:/usr/share/java/xercesImpl.jar:${DBOOK}/lib/xslthl-2.1.3.jar" \
 -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
     -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
     -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeParserConfiguration \
diff --git a/ws/Docbook/Extensions/Tdata/Makefile b/ws/Docbook/Extensions/Tdata/Makefile
index d74fa50497d6d65389f08fdd111fe02fedc15dc6..5f30881ca7512eccc9d5851c5f9b98dd4fdb8f92 100644
--- a/ws/Docbook/Extensions/Tdata/Makefile
+++ b/ws/Docbook/Extensions/Tdata/Makefile
@@ -61,12 +61,12 @@ set       toc,title' \
 webhelp.base.dir=.
 
 # Required for docbook Xsl 1.0 based stylesheets
-SAXON6CMD=java -cp "${DBOOK_XSL}/tools/lib/saxon.jar:${DBOOK_XSL}/extensions/saxon65.jar:${DBOOK_XSL}/lib/xslthl-2.1.3.jar" \
+SAXON6CMD=java -cp "${DBOOK_XSL}/extensions/saxon65.jar:${DBOOK_XSL}/tools/lib/saxon.jar:${DBOOK}/lib/xslthl-2.1.3.jar" \
           '-Dxslthl.config=file://${DBOOK_XSL}/highlighting/xslthl-config.xml' \
           com.icl.saxon.StyleSheet
 
 # XSL 2.0 processor
-SAXONCMD=java -cp "${DBOOK_XSL}/tools/lib/saxon9he.jar:/usr/share/java/xercesImpl.jar:${DBOOK_XSL}/lib/xslthl-2.1.3.jar" \
+SAXONCMD=java -cp "${DBOOK_XSL}/tools/lib/saxon9he.jar:/usr/share/java/xercesImpl.jar:${DBOOK}/lib/xslthl-2.1.3.jar" \
 -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
     -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
     -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeParserConfiguration \