diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src
index b4c5c91b4..6e13dd0f7 100755
--- a/cde/admin/IntegTools/dbTools/installCDE.src
+++ b/cde/admin/IntegTools/dbTools/installCDE.src
@@ -847,13 +847,27 @@ XCOMM
     fi
 
     HASH now load any localized filesets
-
     if [ "$DEVELOP_ENV" != "yes" ]
     then
       if [ "$theLang" != "" ]
       then
         DATABASE_FILES="$DATABASE_FILES CDE-$theLang CDE-MSG-$theLang \
 			CDE-HELP-$theLang"
+      else
+        HASH load all current (working) languages
+        DATABASE_FILES="$DATABASE_FILES \
+                                        CDE-DE \
+                                        CDE-MSG-DE \
+                                        CDE-HELP-DE \
+                                        CDE-ES \
+                                        CDE-MSG-ES \
+                                        CDE-HELP-ES \
+                                        CDE-FR \
+                                        CDE-MSG-FR \
+                                        CDE-HELP-FR \
+                                        CDE-IT \
+                                        CDE-MSG-IT \
+                                        CDE-HELP-IT "
       fi
     fi
   fi
diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index 613a0abfa..2cdc401c4 100644
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -82,9 +82,10 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 # define DtLocalesToBuild ja_JP.dt-eucJP
 #endif
 
-XCOMM No locales other than C will build at this time.
-#ifdef LinuxArchitecture
-# define DtLocalesToBuild 
+XCOMM Make sure you have installed the de_DE, es_ES, fr_FR and it_IT locales.
+XCOMM  or building non-C locales will cause build failures.
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+# define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1
 #endif
 
 #ifdef SunArchitecture
diff --git a/cde/programs/dthelp/parser/canon1/helptag/help.c b/cde/programs/dthelp/parser/canon1/helptag/help.c
index 7ffe7ec19..830bf2ec6 100644
--- a/cde/programs/dthelp/parser/canon1/helptag/help.c
+++ b/cde/programs/dthelp/parser/canon1/helptag/help.c
@@ -1768,7 +1768,7 @@ if (!charset)
 	charset = dotPtr + 1;
     }
 if (dotPtr)
-    *dotPtr = NULL;
+    *dotPtr = 0;
 
 strcpy(stdLang, locale);
 if (charset)
@@ -2250,7 +2250,7 @@ M_WCHAR wc;
 {
 if ((wc >= 0) && (wc <= 255))
     {
-    return _toupper(wc);
+    return toupper(wc);
     }
 return wc;
 }
diff --git a/cde/programs/dthelp/parser/pass2/htag2/sdl.c b/cde/programs/dthelp/parser/pass2/htag2/sdl.c
index f907fa1ea..b75adf6eb 100644
--- a/cde/programs/dthelp/parser/pass2/htag2/sdl.c
+++ b/cde/programs/dthelp/parser/pass2/htag2/sdl.c
@@ -1680,9 +1680,9 @@ while (pThis)
 	    pId = &pThis->u.u_switch.id;
 	    break;
 	default:
-	    fprintf(stderr, errMess);
+          fprintf(stderr, "%s\n", errMess);
 	    if (m_errfile && (m_errfile != stderr))
-		fprintf(m_errfile, errMess);
+		fprintf(m_errfile, "%s\n", errMess);
 	    exit(xxx);
 	}
     if (w_strcmp(rid, *pId) == 0) return pThis;
@@ -2342,9 +2342,9 @@ while (pThis)
 	    pThis = pThis->pNext;
 	    break;
 	default:
-	    fprintf(stderr, errMess);
+	    fprintf(stderr, "%s\n", errMess);
 	    if (m_errfile && (m_errfile != stderr))
-		fprintf(m_errfile, errMess);
+		fprintf(m_errfile, "%s\n", errMess);
 	    exit(xxx);
 	}
     }
@@ -3368,9 +3368,9 @@ while (pThis)
 	    pThis = pThis->pNext;
 	    break;
 	default:
-	    fprintf(stderr, errMess);
+	    fprintf(stderr, "%s\n", errMess);
 	    if (m_errfile && (m_errfile != stderr))
-		fprintf(m_errfile, errMess);
+		fprintf(m_errfile, "%s\n", errMess);
 	    exit(xxx);
 	}
     }
@@ -4915,9 +4915,9 @@ while (pThis)
 	    DeleteElement(pThat);
 	    break;
 	default:
-	    fprintf(stderr, errMess);
+	    fprintf(stderr, "%s\n", errMess);
 	    if (m_errfile && (m_errfile != stderr))
-		fprintf(m_errfile, errMess);
+		fprintf(m_errfile, "%s\n", errMess);
 	    exit(xxx);
 	}
     }
@@ -6409,7 +6409,7 @@ static char      padString[COMPRESS_PAD_LENGTH];
 pc = padString;
 length = COMPRESS_PAD_LENGTH;
 while (--length >= 0)
-    *pc++ = 0xff;
+  *pc++ = (char)0xff;
 
 FcloseFile(outFile, compFileName, xxx);
 newZsize = Compress(compFileName, compZFileName, TRUE) + 4;
diff --git a/cde/programs/localized/templates/French.tmpl b/cde/programs/localized/templates/French.tmpl
index 7a6113834..7e029390f 100644
--- a/cde/programs/localized/templates/French.tmpl
+++ b/cde/programs/localized/templates/French.tmpl
@@ -30,3 +30,7 @@ LANG=fr
 #ifdef UXPArchitecture
 LANG=fr
 #endif
+
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+LANG=fr_FR.ISO8859-1
+#endif
diff --git a/cde/programs/localized/templates/German.tmpl b/cde/programs/localized/templates/German.tmpl
index e0ea4ffe0..890b333a0 100644
--- a/cde/programs/localized/templates/German.tmpl
+++ b/cde/programs/localized/templates/German.tmpl
@@ -30,3 +30,7 @@ LANG=de
 #ifdef UXPArchitecture
 LANG=de
 #endif
+
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+LANG=de_DE.ISO8859-1
+#endif
diff --git a/cde/programs/localized/templates/Italian.tmpl b/cde/programs/localized/templates/Italian.tmpl
index 0dd504455..ccc368beb 100644
--- a/cde/programs/localized/templates/Italian.tmpl
+++ b/cde/programs/localized/templates/Italian.tmpl
@@ -30,3 +30,7 @@ LANG=it
 #ifdef UXPArchitecture
 LANG=it
 #endif
+
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+LANG=it_IT.ISO8859-1
+#endif
diff --git a/cde/programs/localized/templates/Spanish.tmpl b/cde/programs/localized/templates/Spanish.tmpl
index e7d9de5a8..532d01eaf 100644
--- a/cde/programs/localized/templates/Spanish.tmpl
+++ b/cde/programs/localized/templates/Spanish.tmpl
@@ -30,3 +30,7 @@ LANG=es
 #ifdef UXPArchitecture
 LANG=es
 #endif
+
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+LANG=es_ES.ISO8859-1
+#endif
diff --git a/cde/programs/localized/templates/header2.tmpl b/cde/programs/localized/templates/header2.tmpl
index 621fd93b3..bc7b2f356 100644
--- a/cde/programs/localized/templates/header2.tmpl
+++ b/cde/programs/localized/templates/header2.tmpl
@@ -39,12 +39,6 @@ AllTarget($(TMPLOCAL_TARGET))						@@\
 									@@\
 .SUFFIXES: .msg .cat							@@\
 									@@\
-RandomMotifMessageCatalogRule(Xm)					@@\
-									@@\
-RandomMotifMessageCatalogRule(Mrm)					@@\
-									@@\
-RandomMotifMessageCatalogRule(Uil)					@@\
-									@@\
 dtprintinfo.cat: dtprintinfo.msg					@@\
 	@echo "Running sym2num for $@ with LANG set to $(LANG)"		@@\
 	( \								@@\
diff --git a/cde/programs/localized/templates/msg.C.tmpl b/cde/programs/localized/templates/msg.C.tmpl
index b0ae5cb4a..c307c89d4 100644
--- a/cde/programs/localized/templates/msg.C.tmpl
+++ b/cde/programs/localized/templates/msg.C.tmpl
@@ -9,9 +9,6 @@ SHELL=/bin/ksh
 #endif
 
 OBJS= \
-      Xm.cat		\
-      Mrm.cat		\
-      Uil.cat		\
       DtHelp.cat	\
       fmt_tbl.cat	\
       DtMail.cat	\