diff --git a/cde/doc/Makefile.am b/cde/doc/Makefile.am
index 3e31ddf14..7812923ae 100644
--- a/cde/doc/Makefile.am
+++ b/cde/doc/Makefile.am
@@ -3,18 +3,21 @@ MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = en_US.UTF-8
 
 if GERMAN
-SUBDIRS += de_DE.ISO8859-1
+SUBDIRS += de_DE.UTF-8
 endif
 
 if FRENCH
-SUBDIRS += fr_FR.ISO8859-1
+SUBDIRS += fr_FR.UTF-8
 endif
 
 if SPANISH
-SUBDIRS += es_ES.ISO8859-1
+SUBDIRS += es_ES.UTF-8
 endif
 
 if ITALIAN
-SUBDIRS += it_IT.ISO8859-1
+SUBDIRS += it_IT.UTF-8
 endif
 
+if JAPANESE
+SUBDIRS += ja_JP.UTF-8
+endif
diff --git a/cde/doc/common/guides/guides_env.am b/cde/doc/common/guides/guides_env.am
index b742e0845..1ca0bb128 100644
--- a/cde/doc/common/guides/guides_env.am
+++ b/cde/doc/common/guides/guides_env.am
@@ -9,7 +9,7 @@ INFOLIBNAME = -n cde
 # orig: INFOLIBDESC = -d InfoLibDesc
 
 SSENTS = -m common/catalog
-DGENV = LANG=$(LANG) SGML_SEARCH_PATH=".:.."
+DGENV = LC_CTYPE=$(LANG) SGML_SEARCH_PATH=".:.."
 DTINFOGENOPTIONS = $(SSENTS) $(INFOLIBNAME) -d $(INFOLIBDESC)
 
 # Note the quad-dollar sign - this escapes $$ (pid) for the tmp
diff --git a/cde/doc/common/help/sdl-docs.am b/cde/doc/common/help/sdl-docs.am
index 5f4fa8a30..aaf5cd856 100644
--- a/cde/doc/common/help/sdl-docs.am
+++ b/cde/doc/common/help/sdl-docs.am
@@ -19,7 +19,7 @@ DTHELP_HTAG2 = $(top_builddir)/programs/dthelp/parser/pass2/parser/dthelp_htag2
 # but the $(basename...) seems to add a space for some reason
 
 %.sdl:
-	LANG=$(LANG) SGML_SEARCH_PATH=".:.." \
+	LC_CTYPE=$(LANG) SGML_SEARCH_PATH=".:.." \
 		$(KSH) $(DTDOCBOOK) -H $(DTHELP_HTAG2) -L $(LANG) \
 			-o $@ `basename $@ .sdl`/book.sgm
 
diff --git a/cde/doc/en_US.UTF-8/guides/Makefile.am b/cde/doc/en_US.UTF-8/guides/Makefile.am
index 833dbc0e0..776dc50c4 100644
--- a/cde/doc/en_US.UTF-8/guides/Makefile.am
+++ b/cde/doc/en_US.UTF-8/guides/Makefile.am
@@ -9,7 +9,7 @@ include $(top_srcdir)/doc/common/guides/guides_env.am
 BUILT_SOURCES =
 CLEANFILES =
 
-# this sets the LANG and HELP_LANG variables
+# this sets the LANG variables
 include $(top_srcdir)/programs/localized/templates/English.am
 
 # build guide TOCs and deps
@@ -43,7 +43,7 @@ CLEANFILES += $(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf
 # ever change, but for now we will list them as they are currently
 # installed.
 
-cdedtidir = $(CDE_INSTALLATION_TOP)/infolib/$(HELP_LANG)/cde.dti
+cdedtidir = $(CDE_INSTALLATION_TOP)/infolib/$(LANG)/cde.dti
 dist_cdedti_DATA = ../cde.dti/bookcase.map ../cde.dti/cde.oli
 
 cdedtidocdir = $(cdedtidir)/CDEDOC