diff --git a/mozilla/intl/uconv/src/charsetalias.properties b/mozilla/intl/uconv/src/charsetalias.properties
index e20e618386b..adb51d9ff13 100644
--- a/mozilla/intl/uconv/src/charsetalias.properties
+++ b/mozilla/intl/uconv/src/charsetalias.properties
@@ -327,7 +327,6 @@ x-cp1253=windows-1253
 x-cp1254=windows-1254
 x-cp1255=windows-1255
 x-cp1256=windows-1256
-cp1256=windows-1256
 x-cp1257=windows-1257
 x-cp1258=windows-1258
 ##
@@ -441,6 +440,40 @@ csviscii=VISCII
 ## Aliases for VIQR
 ##
 csviqr=VIQR
+##
+## Following names appears in unix nl_langinfo(CODESET)
+## They can be compiled as platform specific if necessary
+## DONT put things here if it does not look generic enough (like hp15CN)
+##
+iso88591=ISO-8859-1
+iso88592=ISO-8859-2
+iso88593=ISO-8859-3
+iso88594=ISO-8859-4
+iso88595=ISO-8859-5
+iso88596=ISO-8859-6
+iso88597=ISO-8859-7
+iso88598=ISO-8859-8
+iso88599=ISO-8859-9
+iso885910=ISO-8859-10
+iso885911=ISO-8859-11
+iso885912=ISO-8859-12
+iso885913=ISO-8859-13
+iso885914=ISO-8859-14
+iso885915=ISO-8859-15
+##
+tis620=TIS-620
+##
+cp1250=windows-1250
+cp1251=windows-1251
+cp1252=windows-1252
+cp1253=windows-1253
+cp1254=windows-1254
+cp1255=windows-1255
+cp1256=windows-1256
+cp1256=windows-1256
+cp1257=windows-1257
+cp1258=windows-1258
+
 ## Tempory charset for testing purpose. Should be remove before Beta
 x-obsoleted-shift_jis=x-obsoleted-Shift_JIS
 x-obsoleted-iso-2022-jp=x-obsoleted-ISO-2022-JP