diff --git a/cde/doc/C/Makefile.am b/cde/doc/C/Makefile.am
index 27a9767d5..9b9d7f8ec 100644
--- a/cde/doc/C/Makefile.am
+++ b/cde/doc/C/Makefile.am
@@ -1,14 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-#all:
-#	$(MKDIR_P) help-sdl
-#	$(MKDIR_P) cde.dti
-#	$(MKDIR_P) m-guides/common
-#	$(LN_S) ../../guides/common/ManLinksMotif.sgm \
-#	m-guides/common/ManLinks.sgm
-
 SUBDIRS = help
 # NOTYET = man guides 
 
-#clean::
-#        $(RM) -r help-sdl cde.dti
diff --git a/cde/doc/C/help/Makefile.am b/cde/doc/C/help/Makefile.am
index c31d55543..7f68fe843 100644
--- a/cde/doc/C/help/Makefile.am
+++ b/cde/doc/C/help/Makefile.am
@@ -11,6 +11,8 @@ APPBUILDER = AppBuilder.sdl
 include $(top_srcdir)/programs/localized/templates/C.am
 # this does all the work
 include $(top_srcdir)/doc/common/help/sdl-docs.am
+# install all of the extra assets
+include $(top_srcdir)/doc/common/help/sdl-data.am
 
 # need to setup a symlink for the en_US locale to point toward C
 install-data-hook:
diff --git a/cde/doc/Makefile.am b/cde/doc/Makefile.am
index 5b565ad61..d93440352 100644
--- a/cde/doc/Makefile.am
+++ b/cde/doc/Makefile.am
@@ -18,10 +18,3 @@ if ITALIAN
 SUBDIRS += it_IT.ISO8859-1
 endif
 
-# JET - these are related to dtinfogen which should be tackled later
-#all::
-#	$(RM) -r tmp
-#	$(MKDIR_P) tmp
-
-#clean::
-#	$(RM) -r tmp
diff --git a/cde/doc/common/help/sdl-data.am b/cde/doc/common/help/sdl-data.am
new file mode 100644
index 000000000..74368c801
--- /dev/null
+++ b/cde/doc/common/help/sdl-data.am
@@ -0,0 +1,94 @@
+# This unit installs the various data that goes with the help SDL files
+# like the graphics and the hf files.
+
+
+# install the common graphics files
+cmngraphdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/graphics
+dist_cmngraph_DATA = $(shell find common/graphics/*)
+
+# install the common/*.hf files
+hfdirdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)
+dist_hfdir_DATA = $(shell ls common/*.hf)
+
+# Now, install any graphics assets found for each help section
+
+# NOTE: we filter out any graphics/CDR directories here - these contain RIFF
+# files.  It does not appear they are, or ever have been used, but we will
+# restrain the urge to delete them all from the repo for now.
+
+# Appmanager
+appmanagerdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Appmanager/graphics
+dist_appmanager_DATA = $(shell [ -d Appmanager/graphics ] && find Appmanager/graphics/* |grep -v /CDR)
+
+# AppBuilder
+appbuilderdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/AppBuilder/graphics
+dist_appbuilder_DATA = $(shell [ -d AppBuilder/graphics ] && find AppBuilder/graphics/* |grep -v /CDR)
+
+# Calculator
+calculatordir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Calculator/graphics
+dist_calculator_DATA = $(shell [ -d Calculator/graphics ] && find Calculator/graphics/* |grep -v /CDR)
+
+# Calendar
+calendardir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Calendar/graphics
+dist_calendar_DATA = $(shell [ -d Calendar/graphics ] && find Calendar/graphics/* |grep -v /CDR)
+
+# CreatAct
+creatactdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/CreatAct/graphics
+dist_creatact_DATA = $(shell [ -d CreatAct/graphics ] && find CreatAct/graphics/* |grep -v /CDR)
+
+# Filemgr
+filemgrdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Filemgr/graphics
+dist_filemgr_DATA = $(shell [ -d Filemgr/graphics ] && find Filemgr/graphics/* |grep -v /CDR)
+
+# FPanel
+fpaneldir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/FPanel/graphics
+dist_fpanel_DATA = $(shell [ -d FPanel/graphics ] && find FPanel/graphics/* |grep -v /CDR)
+
+# Help4Help
+help4helpdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Help4Help/graphics
+dist_help4help_DATA = $(shell [ -d Help4Help/graphics ] && find Help4Help/graphics/* |grep -v /CDR)
+
+# Iconed
+iconeddir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Iconed/graphics
+dist_iconed_DATA = $(shell [ -d Iconed/graphics ] && find Iconed/graphics/* |grep -v /CDR)
+
+# Infomgr
+infomgrdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Infomgr/graphics
+dist_infomgr_DATA = $(shell [ -d Infomgr/graphics ] && find Infomgr/graphics/* |grep -v /CDR)
+
+# Intromgr
+intromgrdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Intromgr/graphics
+dist_intromgr_DATA = $(shell [ -d Intromgr/graphics ] && find Intromgr/graphics/* |grep -v /CDR)
+
+# LibDtPrint
+libdtprintdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/LibDtPrint/graphics
+dist_libdtprint_DATA = $(shell [ -d LibDtPrint/graphics ] && find LibDtPrint/graphics/* |grep -v /CDR)
+
+# Loginmgr
+loginmgrdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Loginmgr/graphics
+dist_loginmgr_DATA = $(shell [ -d Loginmgr/graphics ] && find Loginmgr/graphics/* |grep -v /CDR)
+
+# Mailer
+mailerdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Mailer/graphics
+dist_mailer_DATA = $(shell [ -d Mailer/graphics ] && find Mailer/graphics/* |grep -v /CDR)
+
+# Printmgr
+printmgrdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Printmgr/graphics
+dist_printmgr_DATA = $(shell [ -d Printmgr/graphics ] && find Printmgr/graphics/* |grep -v /CDR)
+
+# PrnSetup
+prnsetupdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/PrnSetup/graphics
+dist_prnsetup_DATA = $(shell [ -d PrnSetup/graphics ] && find PrnSetup/graphics/* |grep -v /CDR)
+
+# Stylemgr
+stylemgrdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Stylemgr/graphics
+dist_stylemgr_DATA = $(shell [ -d Stylemgr/graphics ] && find Stylemgr/graphics/* |grep -v /CDR)
+
+# Terminal
+terminaldir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Terminal/graphics
+dist_terminal_DATA = $(shell [ -d Terminal/graphics ] && find Terminal/graphics/* |grep -v /CDR)
+
+# Textedit
+texteditdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)/Textedit/graphics
+dist_textedit_DATA = $(shell [ -d Textedit/graphics ] && find Textedit/graphics/* |grep -v /CDR)
+
diff --git a/cde/doc/common/help/sdl-docs.am b/cde/doc/common/help/sdl-docs.am
index f12b8252b..f820f5ee6 100644
--- a/cde/doc/common/help/sdl-docs.am
+++ b/cde/doc/common/help/sdl-docs.am
@@ -1,4 +1,4 @@
-# build some SDL docs for the help system
+# build and install SDL files for the help system
 
 BUILT_SOURCES = Appmanager.sdl $(APPBUILDER) Calculator.sdl		\
     Calendar.sdl CreatAct.sdl Filemgr.sdl FPanel.sdl Help4Help.sdl	\
@@ -8,6 +8,7 @@ BUILT_SOURCES = Appmanager.sdl $(APPBUILDER) Calculator.sdl		\
 
 CLEANFILES = $(BUILT_SOURCES)
 
+# install the help SDL files
 sdlhelpdir = $(CDE_INSTALLATION_TOP)/appconfig/help/$(LANG)
 dist_sdlhelp_DATA = $(BUILT_SOURCES)
 
diff --git a/cde/doc/de_DE.ISO8859-1/help/Makefile.am b/cde/doc/de_DE.ISO8859-1/help/Makefile.am
index f4150cb74..7e8ce11bf 100644
--- a/cde/doc/de_DE.ISO8859-1/help/Makefile.am
+++ b/cde/doc/de_DE.ISO8859-1/help/Makefile.am
@@ -7,3 +7,5 @@ MAINTAINERCLEANFILES = Makefile.in
 include $(top_srcdir)/programs/localized/templates/German.am
 # this does all the work
 include $(top_srcdir)/doc/common/help/sdl-docs.am
+# install all of the extra assets
+include $(top_srcdir)/doc/common/help/sdl-data.am
diff --git a/cde/doc/es_ES.ISO8859-1/help/Makefile.am b/cde/doc/es_ES.ISO8859-1/help/Makefile.am
index 0e65de8e7..38eb0217a 100644
--- a/cde/doc/es_ES.ISO8859-1/help/Makefile.am
+++ b/cde/doc/es_ES.ISO8859-1/help/Makefile.am
@@ -7,3 +7,5 @@ MAINTAINERCLEANFILES = Makefile.in
 include $(top_srcdir)/programs/localized/templates/Spanish.am
 # this does all the work
 include $(top_srcdir)/doc/common/help/sdl-docs.am
+# install all of the extra assets
+include $(top_srcdir)/doc/common/help/sdl-data.am
diff --git a/cde/doc/fr_FR.ISO8859-1/help/Makefile.am b/cde/doc/fr_FR.ISO8859-1/help/Makefile.am
index 2207ca826..f77f0bce5 100644
--- a/cde/doc/fr_FR.ISO8859-1/help/Makefile.am
+++ b/cde/doc/fr_FR.ISO8859-1/help/Makefile.am
@@ -7,3 +7,5 @@ MAINTAINERCLEANFILES = Makefile.in
 include $(top_srcdir)/programs/localized/templates/French.am
 # this does all the work
 include $(top_srcdir)/doc/common/help/sdl-docs.am
+# install all of the extra assets
+include $(top_srcdir)/doc/common/help/sdl-data.am
diff --git a/cde/doc/it_IT.ISO8859-1/help/Makefile.am b/cde/doc/it_IT.ISO8859-1/help/Makefile.am
index 534be92e0..fc7357a55 100644
--- a/cde/doc/it_IT.ISO8859-1/help/Makefile.am
+++ b/cde/doc/it_IT.ISO8859-1/help/Makefile.am
@@ -7,3 +7,5 @@ MAINTAINERCLEANFILES = Makefile.in
 include $(top_srcdir)/programs/localized/templates/Italian.am
 # this does all the work
 include $(top_srcdir)/doc/common/help/sdl-docs.am
+# install all of the extra assets
+include $(top_srcdir)/doc/common/help/sdl-data.am