diff --git a/cde/doc/C/guides/Makefile.am b/cde/doc/C/guides/Makefile.am
index 7cf5b6ccb..98708380d 100644
--- a/cde/doc/C/guides/Makefile.am
+++ b/cde/doc/C/guides/Makefile.am
@@ -12,7 +12,7 @@ CLEANFILES =
 # this sets the LANG and HELP_LANG variables
 include $(top_srcdir)/programs/localized/templates/C.am
 
-# build guides
+# build guide TOCs and deps
 include $(top_srcdir)/doc/common/guides/usersGuide.am
 include $(top_srcdir)/doc/common/guides/infoUGuide.am
 include $(top_srcdir)/doc/common/guides/infoAPGuide.am
@@ -22,6 +22,19 @@ include $(top_srcdir)/doc/common/guides/man.am
 include $(top_srcdir)/doc/common/guides/builderGuide.am
 include $(top_srcdir)/doc/common/guides/dtkshGuide.am
 include $(top_srcdir)/doc/common/guides/glossary.am
+include $(top_srcdir)/doc/common/guides/i18nGuide.am
 include $(top_srcdir)/doc/common/guides/progOview.am
 include $(top_srcdir)/doc/common/guides/ttGuide.am
+include $(top_srcdir)/doc/common/guides/helpGuide.am
+include $(top_srcdir)/doc/common/guides/docbookGuide.am
 
+
+# build the infolib + search DB
+INFOLIBDEPS = $(SGMLDEPS) $(top_srcdir)/doc/common/docbook/docbook.stl
+
+$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(INFOLIBDEPS)
+	$(MKDIR_P) $(INFOLIB)
+	$(DGENV) $(DTINFOGEN) build -v -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) $(DGOPTS) $(SSENTS) -l $(INFOLIB) bookcase.bc
+
+BUILT_SOURCES += $(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf
+CLEANFILES += $(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf
diff --git a/cde/doc/common/guides/guides_env.am b/cde/doc/common/guides/guides_env.am
index f3ed77f69..e31b76b81 100644
--- a/cde/doc/common/guides/guides_env.am
+++ b/cde/doc/common/guides/guides_env.am
@@ -4,26 +4,31 @@ INFOLIB = ../cde.dti
 BOOKCASE = CDEDOC
 
 INFOLIBNAME = -n cde
-# INFOLIBDESC = -d InfoLibDesc
+# INFOLIBDESC must be set in the per-lang guides/Makefile.am (without
+# the -d option) prior to including this file.
+# orig: INFOLIBDESC = -d InfoLibDesc
+
 SSENTS = -m common/catalog
 DGENV = LANG=$(LANG) SGML_SEARCH_PATH=".:.."
 DTINFOGENOPTIONS = $(INFOLIBNAME) -d $(INFOLIBDESC)
 
-# Note the triple-dollar sign - this escapes $$ (pid) for the tmp dir
-DTINFOGENTMPDIR = /tmp/guides.$$$
+# Note the quad-dollar sign - this escapes $$ (pid) for the tmp
+# dir. This is required for milti-core builds to work.
+DTINFOGENTMPDIR = /tmp/dtinfogen-guides.$$$$
 
 DTHELPSRC = $(top_srcdir)/lib/DtHelp
 DTLCXENVSETUP = DTLCXSEARCHPATH=$(DTHELPSRC)
 DTINFOGENSRC = $(top_srcdir)/programs/dtinfo/dtinfogen
-SGMLDIR = $(top_builddir)/programs/nsgmls
+NSGMLS = $(top_builddir)/programs/nsgmls
 DTSRDIR = $(top_builddir)/programs/dtsr
 
-DTINFOGEN = $(DTLCXENVSETUP) DTINFO_HOME=$(DTINFOGENSRC) \
-	DTINFO_BIN=$(DTINFOGENSRC)/install:$(DTINFOGENSRC)/mmdb/StyleSheet:$(DTINFOGENSRC)/mmdb/src:$(SGMLDIR):$(DTSRDIR) \
-	$(DTINFOGENSRC)/infolib/etc/dtinfogen
-
 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
+