diff --git a/cde/doc/common/docbook/docbook.stl b/cde/doc/common/docbook/docbook.stl
index 609936f7b..1840c0dd3 100644
--- a/cde/doc/common/docbook/docbook.stl
+++ b/cde/doc/common/docbook/docbook.stl
@@ -1255,7 +1255,7 @@
 		<suffix><content>&gt;</content></suffix>
 	</print>
 
-<PATH> GROUP <select> @Choice == "OPT" && @Rep == "REPEAT" </select> </PATH>
+<PATH> GROUP <select> @Choice == "OPT" &amp;&amp; @Rep == "REPEAT" </select> </PATH>
 	<online>
 		<prefix><content> [</content></prefix>
 		<suffix><content> ]...</content></suffix>
@@ -1275,7 +1275,7 @@
 		<suffix><content> ]</content></suffix>
 	</print>
 
-<PATH> GROUP <select> @Choice == "OPTMULT" && @Rep == "REPEAT" </select> </PATH>
+<PATH> GROUP <select> @Choice == "OPTMULT" &amp;&amp; @Rep == "REPEAT" </select> </PATH>
 	<online>
 		<prefix><content> [[</content></prefix>
 		<suffix><content> ]]...</content></suffix>
@@ -1295,7 +1295,7 @@
 		<suffix><content> ]]</content></suffix>
 	</print>
 
-<PATH> GROUP <select> @Choice == "REQ" && @Rep == "REPEAT" </select> </PATH>
+<PATH> GROUP <select> @Choice == "REQ" &amp;&amp; @Rep == "REPEAT" </select> </PATH>
 	<online>
 		<prefix><content> {</content></prefix>
 		<suffix><content> }...</content></suffix>
@@ -1315,7 +1315,7 @@
 		<suffix><content> }</content></suffix>
 	</print>
 
-<PATH> GROUP <select> @Choice == "REQMULT" && @Rep == "REPEAT" </select> </PATH>
+<PATH> GROUP <select> @Choice == "REQMULT" &amp;&amp; @Rep == "REPEAT" </select> </PATH>
 	<online>
 		<prefix><content> {{</content></prefix>
 		<suffix><content> }}...</content></suffix>
@@ -1345,7 +1345,7 @@
 		<suffix><content> ...</content></suffix>
 	</print>
 
-<PATH> GROUP ARG <select> position != 1 && @Choice == "OPT" && @Rep == "REPEAT" </select> </PATH>
+<PATH> GROUP ARG <select> position != 1 &amp;&amp; @Choice == "OPT" &amp;&amp; @Rep == "REPEAT" </select> </PATH>
 	<online>
 		<prefix><content> | [</content></prefix>
 		<suffix><content> ...]</content></suffix>
@@ -1355,7 +1355,7 @@
 		<suffix><content> ...]</content></suffix>
 	</print>
 
-<PATH> GROUP ARG <select> position != 1 && @Choice == "OPT" </select> </PATH>
+<PATH> GROUP ARG <select> position != 1 &amp;&amp; @Choice == "OPT" </select> </PATH>
 	<online>
 		<prefix><content> | [</content></prefix>
 		<suffix><content>]</content></suffix>
@@ -1365,7 +1365,7 @@
 		<suffix><content>]</content></suffix>
 	</print>
 
-<PATH> GROUP ARG <select> position != 1 && @Rep == "REPEAT" </select> </PATH>
+<PATH> GROUP ARG <select> position != 1 &amp;&amp; @Rep == "REPEAT" </select> </PATH>
 	<online>
 		<prefix><content> | </content></prefix>
 		<suffix><content> ...</content></suffix>
@@ -1383,7 +1383,7 @@
 		<prefix><content> | </content></prefix>
 	</print>
 
-<PATH> ARG <select> @Choice == "OPT" && @Rep == "REPEAT" </select> </PATH>
+<PATH> ARG <select> @Choice == "OPT" &amp;&amp; @Rep == "REPEAT" </select> </PATH>
 	<online>
 		<prefix><content> [</content></prefix>
 		<suffix><content> ...]</content></suffix>
@@ -1505,7 +1505,7 @@
 <!-- Procedures. -->
 <!-- ====================================================================== -->
 
-<PATH> PROCEDURE STEP <select> position == 1 && position == "#LAST" </select> </PATH>
+<PATH> PROCEDURE STEP <select> position == 1 &amp;&amp; position == "#LAST" </select> </PATH>
 	<online>
 		<linebreak both>
 		<prefix>
@@ -1553,7 +1553,7 @@
 <!-- Ordered (numbered) lists. -->
 <!-- ====================================================================== -->
 
-<PATH> ORDEREDLIST LISTITEM <select> position == 1 && position == "#LAST"</select> </PATH>
+<PATH> ORDEREDLIST LISTITEM <select> position == 1 &amp;&amp; position == "#LAST"</select> </PATH>
 	<online>
 		<linebreak both>
 		<prefix>
diff --git a/cde/doc/common/guides/guides_env.am b/cde/doc/common/guides/guides_env.am
index fe36b809a..b742e0845 100644
--- a/cde/doc/common/guides/guides_env.am
+++ b/cde/doc/common/guides/guides_env.am
@@ -9,26 +9,21 @@ INFOLIBNAME = -n cde
 # orig: INFOLIBDESC = -d InfoLibDesc
 
 SSENTS = -m common/catalog
-DGENV = LANG=$(HELP_LANG) SGML_SEARCH_PATH=".:.."
-DTINFOGENOPTIONS = $(INFOLIBNAME) -d $(INFOLIBDESC)
+DGENV = LANG=$(LANG) SGML_SEARCH_PATH=".:.."
+DTINFOGENOPTIONS = $(SSENTS) $(INFOLIBNAME) -d $(INFOLIBDESC)
 
 # Note the quad-dollar sign - this escapes $$ (pid) for the tmp
 # dir. This is required for multi-core builds to work.
 DTINFOGENTMPDIR = /tmp/dtinfogen-guides.$$$$
 
-DTHELPSRC = $(top_srcdir)/lib/DtHelp
-DTLCXENVSETUP = DTLCXSEARCHPATH=$(DTHELPSRC)
-DTINFOGENSRC = $(top_srcdir)/programs/dtinfo/dtinfogen
-NSGMLS = $(top_builddir)/programs/nsgmls
 DTSRDIR = $(top_builddir)/programs/dtsr
 
-SGMLDIR  = $(top_srcdir)/programs/dtinfo/dtinfogen/infolib/C/SGML
-SGMLDEPS = $(SGMLDIR)/docbook.dtd $(SGMLDIR)/iso-box.gml \
-    $(SGMLDIR)/iso-dia.gml $(SGMLDIR)/iso-grk3.gml $(SGMLDIR)/iso-lat1.gml \
-    $(SGMLDIR)/iso-lat2.gml $(SGMLDIR)/iso-num.gml $(SGMLDIR)/iso-pub.gml \
-    $(SGMLDIR)/iso-tech.gml
-
-DTINFOGEN = $(DTLCXENVSETUP) DTINFO_HOME=$(DTINFOGENSRC) \
-	DTINFO_BIN=$(DTINFOGENSRC)/install:$(DTINFOGENSRC)/mmdb/StyleSheet:$(DTINFOGENSRC)/mmdb/src:$(NSGMLS):$(DTSRDIR) \
-	$(DTINFOGENSRC)/infolib/etc/dtinfogen
+SGMLDIR  = $(top_srcdir)/programs/dtdocbook/sgml
+SGMLDEPS = $(SGMLDIR)/docbook.dtd $(SGMLDIR)/isobox.gml \
+    $(SGMLDIR)/isodia.gml $(SGMLDIR)/isogrk3.gml $(SGMLDIR)/isolat1.gml \
+    $(SGMLDIR)/isolat2.gml $(SGMLDIR)/isonum.gml $(SGMLDIR)/isopub.gml \
+    $(SGMLDIR)/isotech.gml
 
+DTINFOGEN = \
+	PATH=$(PATH):$(DTSRDIR) \
+	$(top_srcdir)/programs/dtdocbook/doc_utils/dtdocbook2infolib
diff --git a/cde/doc/common/help/sdl-docs.am b/cde/doc/common/help/sdl-docs.am
index f820f5ee6..5f4fa8a30 100644
--- a/cde/doc/common/help/sdl-docs.am
+++ b/cde/doc/common/help/sdl-docs.am
@@ -12,22 +12,15 @@ CLEANFILES = $(BUILT_SOURCES)
 sdlhelpdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)
 dist_sdlhelp_DATA = $(BUILT_SOURCES)
 
-DTDOCBOOK = $(top_srcdir)/programs/dtdocbook/doc2sdl/dtdocbook
-DOC2SDL_LOC = $(top_srcdir)/programs/dtdocbook/doc2sdl
+DTDOCBOOK = $(top_srcdir)/programs/dtdocbook/doc_utils/dtdocbook2sdl
 DTHELP_HTAG2 = $(top_builddir)/programs/dthelp/parser/pass2/parser/dthelp_htag2
-INSTANT = $(top_builddir)/programs/dtdocbook/instant/instant
-XLATE_LOCALE = $(top_builddir)/programs/dtdocbook/xlate_locale/xlate_locale
-# replace this with a native version detected by autoconf someday
-NSGMLS = $(top_builddir)/programs/nsgmls/nsgmls
 
 # let's try a rule here.  I don't like the backticks for running basename
 # but the $(basename...) seems to add a space for some reason
 
 %.sdl:
-	LANG=$(HELP_LANG) SGML_SEARCH_PATH=".:.." \
-		DTLCXSEARCHPATH=$(top_srcdir)/lib/DtHelp \
-		$(KSH) $(DTDOCBOOK) -t $(DOC2SDL_LOC) -H $(DTHELP_HTAG2) \
-			-I $(INSTANT) -L $(XLATE_LOCALE) -S $(NSGMLS) \
+	LANG=$(LANG) SGML_SEARCH_PATH=".:.." \
+		$(KSH) $(DTDOCBOOK) -H $(DTHELP_HTAG2) -L $(LANG) \
 			-o $@ `basename $@ .sdl`/book.sgm
 
 APPMANAGER_SRCS = Appmanager/GEntity.sgm Appmanager/TOC.sgm		\