diff --git a/cde/doc/de_DE.UTF-8/Makefile.am b/cde/doc/de_DE.UTF-8/Makefile.am
index 7bc125f53..a2334dbfc 100644
--- a/cde/doc/de_DE.UTF-8/Makefile.am
+++ b/cde/doc/de_DE.UTF-8/Makefile.am
@@ -1,5 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = help
-# notyet SUBDIRS = help guides
-
+SUBDIRS = help guides
diff --git a/cde/doc/de_DE.UTF-8/guides/Makefile.am b/cde/doc/de_DE.UTF-8/guides/Makefile.am
new file mode 100644
index 000000000..ef36a31eb
--- /dev/null
+++ b/cde/doc/de_DE.UTF-8/guides/Makefile.am
@@ -0,0 +1,60 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+INFOLIBDESC = "CDE und Motif Informationsbibliothek"
+
+# get some important variables
+include $(top_srcdir)/doc/common/guides/guides_env.am
+
+# prime the pump
+BUILT_SOURCES =
+CLEANFILES =
+
+# this sets the LANG variables
+include $(top_srcdir)/programs/localized/templates/German.am
+
+# 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/sysAdminGuide.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
+
+# installation - these files *may* change depending on if the docs
+# ever change, but for now we will list them as they are currently
+# installed.
+
+cdedtidir = $(CDE_INSTALLATION_TOP)/infolib/$(LANG)/cde.dti
+dist_cdedti_DATA = ../cde.dti/bookcase.map ../cde.dti/cde.oli
+
+cdedtidocdir = $(cdedtidir)/CDEDOC
+dist_cdedtidoc_DATA = ../cde.dti/CDEDOC/CDEDOC.dbd	\
+		../cde.dti/CDEDOC/CDEDOC.dbi	\
+		../cde.dti/CDEDOC/CDEDOC.sch
+
+cdedtidocsearchdir = $(cdedtidocdir)/dtsearch
+dist_cdedtidocsearch_DATA = ../cde.dti/CDEDOC/dtsearch/CDEDOC.d00	\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.d22			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.dbd			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.k21			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.sfx			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.d01			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.d23			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.k00			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.k22			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.stp			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.d21			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.d99			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.k01			\
+	../cde.dti/CDEDOC/dtsearch/CDEDOC.k23			\
+	../cde.dti/CDEDOC/dtsearch/dtsearch.ocf
+
+BUILT_SOURCES += $(cdedti_DATA) $(cdedtidoc_DATA) $(cdedtidocsearch_DATA)
+CLEANFILES += $(cdedti_DATA) $(cdedtidoc_DATA) $(cdedtidocsearch_DATA)
diff --git a/cde/doc/de_DE.UTF-8/guides/infoUGd/Title.am b/cde/doc/de_DE.UTF-8/guides/infoUGd/Title.am
new file mode 100644
index 000000000..5f93e2001
--- /dev/null
+++ b/cde/doc/de_DE.UTF-8/guides/infoUGd/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:05:11 drk $ 
+# TOC title, only what's between quotes should be modified. 
+INFOUGUIDE_TITLE = "Informationsmanager-Benutzerhandbuch"
diff --git a/cde/doc/de_DE.UTF-8/guides/infoUGd/book.sgm b/cde/doc/de_DE.UTF-8/guides/infoUGd/book.sgm
index 83c3255ed..748a8c186 100644
--- a/cde/doc/de_DE.UTF-8/guides/infoUGd/book.sgm
+++ b/cde/doc/de_DE.UTF-8/guides/infoUGd/book.sgm
@@ -1,28 +1,28 @@
 <!-- $XConsortium: book.sgm /main/1 1996/12/17 15:21:02 rws $ -->
 <!DOCTYPE Book PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/guides/sysAdminGuide/Title.am b/cde/doc/de_DE.UTF-8/guides/sysAdminGuide/Title.am
new file mode 100644
index 000000000..dd3f8dcdb
--- /dev/null
+++ b/cde/doc/de_DE.UTF-8/guides/sysAdminGuide/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:05:11 drk $ 
+# TOC title, only what's between quotes should be modified. 
+SYSADMINGUIDE_TITLE = "Benutzerhandbuch f&uuml;r Fortgeschrittene und Systemverwalter"
diff --git a/cde/doc/de_DE.UTF-8/guides/sysAdminGuide/book.sgm b/cde/doc/de_DE.UTF-8/guides/sysAdminGuide/book.sgm
index f0e154097..3579a5399 100644
--- a/cde/doc/de_DE.UTF-8/guides/sysAdminGuide/book.sgm
+++ b/cde/doc/de_DE.UTF-8/guides/sysAdminGuide/book.sgm
@@ -2,31 +2,31 @@
 <!DOCTYPE Book PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOgreekletters PUBLIC "ISO 8879-1986//ENTITIES Greek Letters//EN">
+<!ENTITY % ISOgreekletters PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN">
 %ISOgreekletters;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/guides/usersGuide/Title.am b/cde/doc/de_DE.UTF-8/guides/usersGuide/Title.am
new file mode 100644
index 000000000..cdc372d40
--- /dev/null
+++ b/cde/doc/de_DE.UTF-8/guides/usersGuide/Title.am
@@ -0,0 +1,3 @@
+# $XConsortium: Title.tmpl /main/2 1996/06/19 16:05:11 drk $ 
+# TOC title, only what's between quotes should be modified. 
+USERSGUIDE_TITLE = "Benutzerhandbuch"
diff --git a/cde/doc/de_DE.UTF-8/guides/usersGuide/book.sgm b/cde/doc/de_DE.UTF-8/guides/usersGuide/book.sgm
index edad18ec1..46cd83525 100644
--- a/cde/doc/de_DE.UTF-8/guides/usersGuide/book.sgm
+++ b/cde/doc/de_DE.UTF-8/guides/usersGuide/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Book PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Appmanager/book.sgm b/cde/doc/de_DE.UTF-8/help/Appmanager/book.sgm
index a0dfefd54..31d51ab48 100644
--- a/cde/doc/de_DE.UTF-8/help/Appmanager/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Appmanager/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Calculator/book.sgm b/cde/doc/de_DE.UTF-8/help/Calculator/book.sgm
index 3ea480a3e..3bba8bf2d 100644
--- a/cde/doc/de_DE.UTF-8/help/Calculator/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Calculator/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Calendar/book.sgm b/cde/doc/de_DE.UTF-8/help/Calendar/book.sgm
index 40722e9c3..2f4b10822 100644
--- a/cde/doc/de_DE.UTF-8/help/Calendar/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Calendar/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/CreatAct/book.sgm b/cde/doc/de_DE.UTF-8/help/CreatAct/book.sgm
index e10c5e554..18d3d3d6d 100644
--- a/cde/doc/de_DE.UTF-8/help/CreatAct/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/CreatAct/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/FPanel/book.sgm b/cde/doc/de_DE.UTF-8/help/FPanel/book.sgm
index 827fa9a5e..3659f0f27 100644
--- a/cde/doc/de_DE.UTF-8/help/FPanel/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/FPanel/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Filemgr/book.sgm b/cde/doc/de_DE.UTF-8/help/Filemgr/book.sgm
index 26cfbf079..43a6f6385 100644
--- a/cde/doc/de_DE.UTF-8/help/Filemgr/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Filemgr/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Help4Help/book.sgm b/cde/doc/de_DE.UTF-8/help/Help4Help/book.sgm
index 03d530bfd..fc576e7c1 100644
--- a/cde/doc/de_DE.UTF-8/help/Help4Help/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Help4Help/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Iconed/book.sgm b/cde/doc/de_DE.UTF-8/help/Iconed/book.sgm
index 9bb2fedae..5499b4406 100644
--- a/cde/doc/de_DE.UTF-8/help/Iconed/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Iconed/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Infomgr/book.sgm b/cde/doc/de_DE.UTF-8/help/Infomgr/book.sgm
index fafff8104..7e1cb773d 100644
--- a/cde/doc/de_DE.UTF-8/help/Infomgr/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Infomgr/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Intromgr/book.sgm b/cde/doc/de_DE.UTF-8/help/Intromgr/book.sgm
index 2d3e6d4ef..6f07794a1 100644
--- a/cde/doc/de_DE.UTF-8/help/Intromgr/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Intromgr/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/LibDtPrint/book.sgm b/cde/doc/de_DE.UTF-8/help/LibDtPrint/book.sgm
index c5eb44d26..f061d48b6 100644
--- a/cde/doc/de_DE.UTF-8/help/LibDtPrint/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/LibDtPrint/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Loginmgr/book.sgm b/cde/doc/de_DE.UTF-8/help/Loginmgr/book.sgm
index 595fc5771..67ac44f1f 100644
--- a/cde/doc/de_DE.UTF-8/help/Loginmgr/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Loginmgr/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Mailer/book.sgm b/cde/doc/de_DE.UTF-8/help/Mailer/book.sgm
index fcb55c593..3b3aaac98 100644
--- a/cde/doc/de_DE.UTF-8/help/Mailer/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Mailer/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Makefile.am b/cde/doc/de_DE.UTF-8/help/Makefile.am
index 97e9e95f0..f7adf4852 100644
--- a/cde/doc/de_DE.UTF-8/help/Makefile.am
+++ b/cde/doc/de_DE.UTF-8/help/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-# this sets the LANG and HELP_LANG variables
+# this sets the LANG variables
 include $(top_srcdir)/programs/localized/templates/German.am
 # this does all the work
 include $(top_srcdir)/doc/common/help/sdl-docs.am
diff --git a/cde/doc/de_DE.UTF-8/help/Printmgr/book.sgm b/cde/doc/de_DE.UTF-8/help/Printmgr/book.sgm
index 197faf9d7..709d36377 100644
--- a/cde/doc/de_DE.UTF-8/help/Printmgr/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Printmgr/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/PrnSetup/book.sgm b/cde/doc/de_DE.UTF-8/help/PrnSetup/book.sgm
index 1c91c6ed2..51756adc6 100644
--- a/cde/doc/de_DE.UTF-8/help/PrnSetup/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/PrnSetup/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Stylemgr/book.sgm b/cde/doc/de_DE.UTF-8/help/Stylemgr/book.sgm
index 50c274aa6..594a3a51b 100644
--- a/cde/doc/de_DE.UTF-8/help/Stylemgr/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Stylemgr/book.sgm
@@ -1,28 +1,28 @@
 <!-- $XConsortium: book.sgm /main/6 1996/06/19 16:30:37 drk $ -->
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Terminal/book.sgm b/cde/doc/de_DE.UTF-8/help/Terminal/book.sgm
index b07b433f7..2013565fc 100644
--- a/cde/doc/de_DE.UTF-8/help/Terminal/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Terminal/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/Textedit/book.sgm b/cde/doc/de_DE.UTF-8/help/Textedit/book.sgm
index 465b62e8b..0eb64cdee 100644
--- a/cde/doc/de_DE.UTF-8/help/Textedit/book.sgm
+++ b/cde/doc/de_DE.UTF-8/help/Textedit/book.sgm
@@ -2,28 +2,28 @@
 <!DOCTYPE Part PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" [
 
 
-<!ENTITY % ISOpublishing PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN">
+<!ENTITY % ISOpublishing PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN">
 %ISOpublishing;
 
-<!ENTITY % ISOnumeric PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
+<!ENTITY % ISOnumeric PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
 %ISOnumeric;
 
-<!ENTITY % ISOdiacritical PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
+<!ENTITY % ISOdiacritical PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN">
 %ISOdiacritical;
 
-<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN">
+<!ENTITY % ISOgeneraltech PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN">
 %ISOgeneraltech;
 
-<!ENTITY % ISOalatin1 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN">
+<!ENTITY % ISOalatin1 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN">
 %ISOalatin1;
 
-<!ENTITY % ISOalatin2 PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN">
+<!ENTITY % ISOalatin2 PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN">
 %ISOalatin2;
 
-<!ENTITY % ISOgreek PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN">
+<!ENTITY % ISOgreek PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN">
 %ISOgreek;
 
-<!ENTITY % ISOboxandline PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
+<!ENTITY % ISOboxandline PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
 %ISOboxandline;
 
 
diff --git a/cde/doc/de_DE.UTF-8/help/common/Desktop.hf b/cde/doc/de_DE.UTF-8/help/common/Desktop.hf
index 6461a1dbb..982a7ba5e 100644
--- a/cde/doc/de_DE.UTF-8/help/common/Desktop.hf
+++ b/cde/doc/de_DE.UTF-8/help/common/Desktop.hf
@@ -14,9 +14,9 @@
 !#####################################################################
 
 
-*.charSet:      iso8859-1
+*.charSet:      UTF-8
 *.title:        Common Desktop Environment
-*.bitmap:       /usr/dt/appconfig/help/de_DE.ISO8859-1/graphics/cdelogo.pm
+*.bitmap:       /usr/dt/appconfig/help/de_DE.UTF-8/graphics/cdelogo.pm
 *.abstract:     Überblick und Grundkenntnisse für das Desktop \
  * Hilfe für Hilfe \
  * Anwendungsmanager \
diff --git a/cde/doc/de_DE.UTF-8/help/common/DesktopIntro.hf b/cde/doc/de_DE.UTF-8/help/common/DesktopIntro.hf
index 811def301..a07701c31 100644
--- a/cde/doc/de_DE.UTF-8/help/common/DesktopIntro.hf
+++ b/cde/doc/de_DE.UTF-8/help/common/DesktopIntro.hf
@@ -14,9 +14,9 @@
 !#####################################################################
 
 
-*.charSet:      iso8859-1
+*.charSet:      UTF-8
 *.title:        Überblick und Grundkenntnisse für das Desktop
-*.bitmap:       /usr/dt/appconfig/help/de_DE.ISO8859-1/graphics/cdelogo.pm
+*.bitmap:       /usr/dt/appconfig/help/de_DE.UTF-8/graphics/cdelogo.pm
 *.abstract:     Überblick und Grundkenntnisse für das \
                 Common Desktop Environment.