diff --git a/cde/databases/CDE-RUN.udb b/cde/databases/CDE-RUN.udb
index 49013224c..ce3517c6a 100644
--- a/cde/databases/CDE-RUN.udb
+++ b/cde/databases/CDE-RUN.udb
@@ -2636,44 +2636,44 @@ programs/localized/C/dtsr/eng.stp
 	install_target = /usr/dt/infolib/etc/C/dtsr/eng.stp
 }
 #
-programs/localized/de_DE.ISO8859-1/dtsr/deu.sfx
+programs/localized/de_DE.UTF-8/dtsr/deu.sfx
 { default
-	install_target = /usr/dt/infolib/etc/de_DE.ISO8859-1/dtsr/deu.sfx
+	install_target = /usr/dt/infolib/etc/de_DE.UTF-8/dtsr/deu.sfx
 }
 #
-programs/localized/de_DE.ISO8859-1/dtsr/deu.stp
+programs/localized/de_DE.UTF-8/dtsr/deu.stp
 { default
-	install_target = /usr/dt/infolib/etc/de_DE.ISO8859-1/dtsr/deu.stp
+	install_target = /usr/dt/infolib/etc/de_DE.UTF-8/dtsr/deu.stp
 }
 #
-programs/localized/es_ES.ISO8859-1/dtsr/esp.sfx
+programs/localized/es_ES.UTF-8/dtsr/esp.sfx
 { default
-	install_target = /usr/dt/infolib/etc/es_ES.ISO8859-1/dtsr/esp.sfx
+	install_target = /usr/dt/infolib/etc/es_ES.UTF-8/dtsr/esp.sfx
 }
 #
-programs/localized/es_ES.ISO8859-1/dtsr/esp.stp
+programs/localized/es_ES.UTF-8/dtsr/esp.stp
 { default
-	install_target = /usr/dt/infolib/etc/es_ES.ISO8859-1/dtsr/esp.stp
+	install_target = /usr/dt/infolib/etc/es_ES.UTF-8/dtsr/esp.stp
 }
 #
-programs/localized/fr_FR.ISO8859-1/dtsr/fra.sfx
+programs/localized/fr_FR.UTF-8/dtsr/fra.sfx
 { default
-	install_target = /usr/dt/infolib/etc/fr_FR.ISO8859-1/dtsr/fra.sfx
+	install_target = /usr/dt/infolib/etc/fr_FR.UTF-8/dtsr/fra.sfx
 }
 #
-programs/localized/fr_FR.ISO8859-1/dtsr/fra.stp
+programs/localized/fr_FR.UTF-8/dtsr/fra.stp
 { default
-	install_target = /usr/dt/infolib/etc/fr_FR.ISO8859-1/dtsr/fra.stp
+	install_target = /usr/dt/infolib/etc/fr_FR.UTF-8/dtsr/fra.stp
 }
 #
-programs/localized/it_IT.ISO8859-1/dtsr/ita.sfx
+programs/localized/it_IT.UTF-8/dtsr/ita.sfx
 { default
-	install_target = /usr/dt/infolib/etc/it_IT.ISO8859-1/dtsr/ita.sfx
+	install_target = /usr/dt/infolib/etc/it_IT.UTF-8/dtsr/ita.sfx
 }
 #
-programs/localized/it_IT.ISO8859-1/dtsr/ita.stp
+programs/localized/it_IT.UTF-8/dtsr/ita.stp
 { default
-	install_target = /usr/dt/infolib/etc/it_IT.ISO8859-1/dtsr/ita.stp
+	install_target = /usr/dt/infolib/etc/it_IT.UTF-8/dtsr/ita.stp
 }
 #
 programs/localized/ja_JP.dt-eucJP/dtsr/jpn.knj
diff --git a/cde/databases/Imakefile b/cde/databases/Imakefile
index f95da01e5..958b53294 100644
--- a/cde/databases/Imakefile
+++ b/cde/databases/Imakefile
@@ -211,7 +211,7 @@ CppSourceFile(CDE-LOC-DE.tmp,CDE-LOC.src,$(DE_LOC_CPP_LIST),)
 CppSourceFile(CDE-HELP-LOC-DE.tmp,CDE-HELP-LOC.src,$(DE_LOC_CPP_LIST),)
 CppSourceFile(CDE-MSG-LOC-DE.tmp,CDE-MSG-LOC.src,$(DE_LOC_CPP_LIST),)
 CppSourceFile(CDE-INFOLIB-LOC-DE.tmp,CDE-INFOLIB-LOC.src,$(DE_LOC_CPP_LIST),)
-CreateLocalizedFilesets(DE,de_DE.UTF-8,German,CDE-LANGS,CDE-GER-I-HELP,CDE-GER-I-MSG,de_DE.UTF-8,de_DE.UTF-8,CDE-LOC-DE.tmp,CDE-HELP-LOC-DE.tmp,CDE-MSG-LOC-DE.tmp,CDE-INFOLIB-LOC-DE.tmp)
+CreateLocalizedFilesets(DE,de_DE.UTF-8,German,CDE-LANGS,CDE-GER-I-HELP,CDE-GER-I-MSG,de_DE.UTF-8,de_DE.ISO8859-1,CDE-LOC-DE.tmp,CDE-HELP-LOC-DE.tmp,CDE-MSG-LOC-DE.tmp,CDE-INFOLIB-LOC-DE.tmp)
 
 /*
  * Spanish
@@ -221,7 +221,7 @@ CppSourceFile(CDE-LOC-ES.tmp,CDE-LOC.src,$(ES_LOC_CPP_LIST),)
 CppSourceFile(CDE-HELP-LOC-ES.tmp,CDE-HELP-LOC.src,$(ES_LOC_CPP_LIST),)
 CppSourceFile(CDE-MSG-LOC-ES.tmp,CDE-MSG-LOC.src,$(ES_LOC_CPP_LIST),)
 CppSourceFile(CDE-INFOLIB-LOC-ES.tmp,CDE-INFOLIB-LOC.src,$(ES_LOC_CPP_LIST),)
-CreateLocalizedFilesets(ES,es_ES.UTF-8,Spanish,CDE-LANGS,CDE-SPA-I-HELP,CDE-SPA-I-MSG,es_ES.UTF-8,es_ES.UTF-8,CDE-LOC-ES.tmp,CDE-HELP-LOC-ES.tmp,CDE-MSG-LOC-ES.tmp,CDE-INFOLIB-LOC-ES.tmp)
+CreateLocalizedFilesets(ES,es_ES.UTF-8,Spanish,CDE-LANGS,CDE-SPA-I-HELP,CDE-SPA-I-MSG,es_ES.UTF-8,es_ES.ISO8859-1,CDE-LOC-ES.tmp,CDE-HELP-LOC-ES.tmp,CDE-MSG-LOC-ES.tmp,CDE-INFOLIB-LOC-ES.tmp)
 
 /*
  * French
@@ -231,7 +231,7 @@ CppSourceFile(CDE-LOC-FR.tmp,CDE-LOC.src,$(FR_LOC_CPP_LIST),)
 CppSourceFile(CDE-HELP-LOC-FR.tmp,CDE-HELP-LOC.src,$(FR_LOC_CPP_LIST),)
 CppSourceFile(CDE-MSG-LOC-FR.tmp,CDE-MSG-LOC.src,$(FR_LOC_CPP_LIST),)
 CppSourceFile(CDE-INFOLIB-LOC-FR.tmp,CDE-INFOLIB-LOC.src,$(FR_LOC_CPP_LIST),)
-CreateLocalizedFilesets(FR,fr_FR.UTF-8,French,CDE-LANGS,CDE-FRE-I-HELP,CDE-FRE-I-MSG,fr_FR.UTF-8,fr_FR.UTF-8,CDE-LOC-FR.tmp,CDE-HELP-LOC-FR.tmp,CDE-MSG-LOC-FR.tmp,CDE-INFOLIB-LOC-FR.tmp)
+CreateLocalizedFilesets(FR,fr_FR.UTF-8,French,CDE-LANGS,CDE-FRE-I-HELP,CDE-FRE-I-MSG,fr_FR.UTF-8,fr_FR.ISO8859-1,CDE-LOC-FR.tmp,CDE-HELP-LOC-FR.tmp,CDE-MSG-LOC-FR.tmp,CDE-INFOLIB-LOC-FR.tmp)
 
 /*
  * Italian
@@ -241,7 +241,7 @@ CppSourceFile(CDE-LOC-IT.tmp,CDE-LOC.src,$(IT_LOC_CPP_LIST),)
 CppSourceFile(CDE-HELP-LOC-IT.tmp,CDE-HELP-LOC.src,$(IT_LOC_CPP_LIST),)
 CppSourceFile(CDE-MSG-LOC-IT.tmp,CDE-MSG-LOC.src,$(IT_LOC_CPP_LIST),)
 CppSourceFile(CDE-INFOLIB-LOC-IT.tmp,CDE-INFOLIB-LOC.src,$(IT_LOC_CPP_LIST),)
-CreateLocalizedFilesets(IT,it_IT.UTF-8,Italian,CDE-LANGS,CDE-ITA-I-HELP,CDE-ITA-I-MSG,it_IT.UTF-8,it_IT.UTF-8,CDE-LOC-IT.tmp,CDE-HELP-LOC-IT.tmp,CDE-MSG-LOC-IT.tmp,CDE-INFOLIB-LOC-IT.tmp)
+CreateLocalizedFilesets(IT,it_IT.UTF-8,Italian,CDE-LANGS,CDE-ITA-I-HELP,CDE-ITA-I-MSG,it_IT.UTF-8,it_IT.ISO8859-1,CDE-LOC-IT.tmp,CDE-HELP-LOC-IT.tmp,CDE-MSG-LOC-IT.tmp,CDE-INFOLIB-LOC-IT.tmp)
 
 /*
  * Japanese