diff --git a/src/kits/textencoding/character_sets.cpp b/src/kits/textencoding/character_sets.cpp
index 65eadba93c..eb90d731ec 100644
--- a/src/kits/textencoding/character_sets.cpp
+++ b/src/kits/textencoding/character_sets.cpp
@@ -8,109 +8,246 @@ namespace BPrivate {
 /**
  * These variables are used in defining the character_sets_by_id array below.
  * @see http://www.iana.org/assignments/character-sets
+ * @see http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html
+ * @see http://www.openi18n.org/subgroups/sa/locnameguide/final/CodesetAliasTable.html
  **/
 
-static const BCharacterSet unicode(0,106,"Unicode","UTF-8","UTF-8",NULL);
+static const char * unicodeAliases[] = {
+	// IANA aliases
+	// java aliases
+	"UTF8", "unicode-1-1-utf-8",
+	NULL
+};
+static const BCharacterSet unicode(0,106,"Unicode","UTF-8","UTF-8",unicodeAliases);
 
-static const char * isoLatin1aliases[] =
- { "iso-ir-100","ISO_8859-1","ISO-8859-1","latin1","11","IBM819","CP819","csISOLatin1",NULL };
+static const char * isoLatin1aliases[] = {
+	// IANA aliases
+	"iso-ir-100", "ISO_8859-1", "ISO-8859-1", "latin1", "11", "IBM819", "CP819", "csISOLatin1",
+	// java aliases
+	"819", "IBM-819", "ISO8859_1", "8859_1", "ISO8859-1",
+	NULL
+};
 static const BCharacterSet isoLatin1(1,4,"ISO West European","ISO_8859-1:1987","ISO-8859-1",isoLatin1aliases);
 
-static const char * isoLatin2aliases[] =
- { "iso-ir-101","ISO_8859-2","ISO-8859-2","latin2","12","csISOLatin2",NULL };
+static const char * isoLatin2aliases[] = {
+	// IANA aliases
+	"iso-ir-101", "ISO_8859-2", "ISO-8859-2", "latin2", "12", "csISOLatin2",
+	// java aliases
+	"iso8859_2", "8859_2", "ISO8859-2", "ibm912", "ibm-912", "cp912", "912",
+	NULL
+};
 static const BCharacterSet isoLatin2(2,5,"ISO East European","ISO_8859-2:1987","ISO-8859-2",isoLatin2aliases);
 
-static const char * isoLatin3aliases[] =
- { "iso-ir-109","ISO_8859-3","ISO-8859-3","latin3","13","csISOLatin3",NULL };
+static const char * isoLatin3aliases[] = {
+	// IANA aliases
+	"iso-ir-109", "ISO_8859-3", "ISO-8859-3", "latin3", "13", "csISOLatin3",
+	// java aliases
+	"iso8859_3", "8859_3", "iso8859-3", "ibm913", "ibm-913", "cp913", "913",
+	NULL
+};
 static const BCharacterSet isoLatin3(3,6,"ISO South European","ISO_8859-3:1988","ISO-8859-3",isoLatin3aliases);
 
-static const char * isoLatin4aliases[] =
- { "iso-ir-110","ISO_8859-4","ISO-8859-4","latin4","14","csISOLatin4",NULL };
+static const char * isoLatin4aliases[] = {
+	// IANA aliases
+	"iso-ir-110", "ISO_8859-4", "ISO-8859-4", "latin4", "14", "csISOLatin4",
+	// java aliases
+	"iso8859_4", "iso8859-4", "8859_4", "ibm914", "ibm-914", "cp914", "914",
+	NULL
+};
 static const BCharacterSet isoLatin4(4,7,"ISO North European","ISO_8859-4:1988","ISO-8859-4",isoLatin4aliases);
 
-static const char * isoLatin5aliases[] =
- { "iso-ir-144","ISO_8859-5","ISO-8859-5","cyrillic","csISOLatinCyrillic",NULL };
+static const char * isoLatin5aliases[] = {
+	// IANA aliases
+	"iso-ir-144", "ISO_8859-5", "ISO-8859-5", "cyrillic", "csISOLatinCyrillic",
+	// java aliases
+	"iso8859_5", "8859_5", "ISO8859-5", "ibm915", "ibm-915", "cp915", "915",
+	NULL
+};
 static const BCharacterSet isoLatin5(5,8,"ISO Cyrillic","ISO_8859-5:1988","ISO-8859-5",isoLatin5aliases);
 
-static const char * isoLatin6aliases[] =
- { "iso-ir-127","ISO_8859-6","ISO-8859-6","ECMA-114","ASMO-708","arabic","csISOLatinArabic",NULL };
+static const char * isoLatin6aliases[] = {
+	// IANA aliases
+	"iso-ir-127", "ISO_8859-6", "ISO-8859-6", "ECMA-114", "ASMO-708", "arabic", "csISOLatinArabic",
+	// java aliases
+	"iso8859_6", "8859_6", "ISO8859-6", "ibm1089", "ibm-1089", "cp1089", "1089",
+	NULL
+};
 static const BCharacterSet isoLatin6(6,9,"ISO Arabic","ISO_8859-6:1987","ISO-8859-6",isoLatin6aliases);
 
-static const char * isoLatin7aliases[] =
- { "iso-ir-126","ISO_8859-7","ISO-8859-7","ELOT_928","ECMA-118","greek","greek8","csISOLatinGreek",NULL };
+static const char * isoLatin7aliases[] = {
+	// IANA aliases
+	"iso-ir-126", "ISO_8859-7", "ISO-8859-7", "ELOT_928", "ECMA-118", "greek", "greek8", "csISOLatinGreek",
+	// java aliases
+	"iso8859_7", "8859_7", "iso8859-7", "sun_eu_greek", "ibm813", "ibm-813", "813", "cp813",
+	NULL
+};
 static const BCharacterSet isoLatin7(7,10,"ISO Greek","ISO_8859-7:1987","ISO-8859-7",isoLatin7aliases);
 
-static const char * isoLatin8aliases[] =
- { "iso-ir-138","ISO_8859-8","ISO-8859-8","hebrew","csISOLatinHebrew",NULL };
+static const char * isoLatin8aliases[] = {
+	// IANA aliases
+	"iso-ir-138", "ISO_8859-8", "ISO-8859-8", "hebrew", "csISOLatinHebrew",
+	// java aliases
+	"iso8859_8", "8859_8", "ISO8859-8", "cp916", "916", "ibm916", "ibm-916",
+	NULL
+};
 static const BCharacterSet isoLatin8(8,11,"ISO Hebrew","ISO_8859-8:1988","ISO-8859-8",isoLatin8aliases);
 
-static const char * isoLatin9aliases[] =
- { "iso-ir-148","ISO_8859-9","ISO-8859-9","latin5","15","csISOLatin5",NULL };
+static const char * isoLatin9aliases[] = {
+	// IANA aliases
+	"iso-ir-148", "ISO_8859-9", "ISO-8859-9", "latin5", "15", "csISOLatin5",
+	// java aliases
+	"iso8859_9", "8859_9", "ibm920", "ibm-920", "920", "cp920",
+	NULL
+};
 const BCharacterSet isoLatin9(9,12,"ISO Turkish","ISO_8859-9:1989","ISO-8859-9",isoLatin9aliases);
 
-static const char * isoLatin10aliases[] =
- { "iso-ir-157","16","ISO_8859-10:1992","csISOLatin6","latin6",NULL };
+static const char * isoLatin10aliases[] = {
+	// IANA aliases
+	"iso-ir-157", "16", "ISO_8859-10:1992", "csISOLatin6", "latin6",
+	// java aliases
+	NULL
+};
 static const BCharacterSet isoLatin10(10,13,"ISO Nordic","ISO-8859-10","ISO-8859-10",isoLatin10aliases);
 
-static const char * macintoshAliases[] =
- { "mac","csMacintosh",NULL };
+static const char * macintoshAliases[] = {
+	// IANA aliases
+	"mac", "csMacintosh",
+	// java aliases
+	"MacRoman",
+	NULL
+};
 static const BCharacterSet macintosh(11,2027,"Macintosh Roman","macintosh",NULL,macintoshAliases);
 
-static const char * shiftJISaliases[] =
- { "MS_Kanji","csShiftJIS",NULL };
+static const char * shiftJISaliases[] = {
+	// IANA aliases
+	"MS_Kanji", "csShiftJIS",
+	// java aliases
+	"sjis", "shift_jis", "shift-jis", "x-sjis",
+	NULL
+};
 static const BCharacterSet shiftJIS(12,17,"Japanese Shift JIS","Shift_JIS","Shift_JIS",shiftJISaliases);
 
-static const char * EUCPackedJapaneseAliases[] =
- { "EUC-JP","csEUCPkdFmtJapanese",NULL };
+static const char * EUCPackedJapaneseAliases[] = {
+	// IANA aliases
+	"EUC-JP", "csEUCPkdFmtJapanese",
+	// java aliases
+	"eucjis", "eucjp", "x-euc-jp", "x-eucjp",
+	NULL
+};
 static const BCharacterSet packedJapanese(13,18,"Japanese EUC",
                                    "Extended_UNIX_Code_Packed_Format_for_Japanese","EUC-JP",
                                    EUCPackedJapaneseAliases);
 
-static const char * iso2022jpAliases[] =
- { "csISO2022JP",NULL };
+static const char * iso2022jpAliases[] = {
+	// IANA aliases
+	"csISO2022JP",
+	// java aliases
+	"iso2022jp", "jis", "jis_encoding", "csjisencoding",
+	NULL
+};
 static const BCharacterSet iso2022jp(14,39,"Japanese JIS","ISO-2022-JP","ISO-2022-JP",iso2022jpAliases);
 
-static const BCharacterSet windows1252(15,2252,"Windows Latin-1 (CP 1252)","windows-1252",NULL,NULL);
+static const char * windows1252aliases[] = {
+	// IANA aliases
+	// java aliases
+	"cp1252", "cp5348",
+	NULL
+};
+static const BCharacterSet windows1252(15,2252,"Windows Latin-1 (CP 1252)","windows-1252",NULL,windows1252aliases);
 
-static const char * unicode2aliases[] =
- { "csUnicode",NULL };
-static const BCharacterSet unicode2(16,1000,"Unicode 2.0","ISO-10646-UCS-2",NULL,unicode2aliases);
+static const char * unicode2aliases[] = {
+	// IANA aliases
+	"csUnicode",
+	// java aliases
+	"UTF_16BE", "X-UTF-16BE", "UnicodeBigUnmarked",
+	NULL
+};
+static const BCharacterSet unicode2(16,1000,"Unicode (UTF-16)","ISO-10646-UCS-2",NULL,unicode2aliases);
 
-static const char * KOI8Raliases[] =
- { "csKOI8R",NULL };
+static const char * KOI8Raliases[] = {
+	// IANA aliases
+	"csKOI8R",
+	// java aliases
+	"koi8_r", "koi8", "cskoi8r",
+	NULL
+};
 static const BCharacterSet KOI8R(17,2084,"KOI8-R Cyrillic","KOI8-R","KOI8-R",KOI8Raliases);
 
-static const BCharacterSet windows1251(18,2251,"Windows Cyrillic (CP 1251)","windows-1251",NULL,NULL);
+static const char * windows1251aliases[] = {
+	// IANA aliases
+	// java aliases
+	"cp1251", "cp5347", "ansi-1251",
+	NULL
+};
+static const BCharacterSet windows1251(18,2251,"Windows Cyrillic (CP 1251)","windows-1251",NULL,windows1251aliases);
 
-static const char * IBM866aliases[] =
- { "cp866","866","csIBM866",NULL };
+static const char * IBM866aliases[] = {
+	// IANA aliases
+	"cp866", "866", "csIBM866",
+	// java aliases
+	"ibm-866",
+	NULL
+};
 static const BCharacterSet IBM866(19,2086,"DOS Cyrillic","IBM866","IBM866",IBM866aliases);
 
-static const char * IBM437aliases[] =
- { "cp437","437","csPC8CodePage437",NULL };
+static const char * IBM437aliases[] = {
+	// IANA aliases
+	"cp437", "437", "csPC8CodePage437",
+	// java aliases
+	"ibm-437", "windows-437",
+	NULL
+};
 static const BCharacterSet IBM437(20,2011,"DOS Latin-US","IBM437","IBM437",IBM437aliases);
 
-static const char * eucKRaliases[] =
- { "csEUCKR",NULL };
+static const char * eucKRaliases[] = {
+	// IANA aliases
+	"csEUCKR",
+	// java aliases
+	"ksc5601", "euckr", "ks_c_5601-1987", "ksc5601-1987", "ksc5601_1987", "ksc_5601", "5601",
+	NULL
+};
 static const BCharacterSet eucKR(21,38,"EUC Korean","EUC-KR","EUC-KR",eucKRaliases);
 
-static const BCharacterSet iso13(22,109,"ISO Baltic","ISO-8859-13","ISO-8859-13",NULL);
+static const char * iso13aliases[] = {
+	// IANA aliases
+	// java aliases
+	"iso8859_13", "8859_13", "iso_8859-13", "ISO8859-13",
+	NULL
+};
+static const BCharacterSet iso13(22,109,"ISO Baltic","ISO-8859-13","ISO-8859-13",iso13aliases);
 
-static const char * iso14aliases[] =
- { "iso-ir-199","ISO_8859-14:1998","ISO_8859-14","latin8","iso-celtic","l8",NULL };
+static const char * iso14aliases[] = {
+	// IANA aliases
+	"iso-ir-199", "ISO_8859-14:1998", "ISO_8859-14", "latin8", "iso-celtic", "l8",
+	NULL
+};
 static const BCharacterSet iso14(23,110,"ISO Celtic","ISO-8859-14","ISO-8859-14",iso14aliases);
 
-static const char * iso15aliases[] =
- { "ISO_8859-14","Latin-9",NULL };
+static const char * iso15aliases[] = {
+	// IANA aliases
+	"ISO_8859-15", "Latin-9",
+	// java aliases
+	"8859_15", "ISO8859_15", "ISO8859-15", "IBM923", "IBM-923", "cp923", "923",
+	"LATIN0", "LATIN9", "L9", "csISOlatin0", "csISOlatin9", "ISO8859_15_FDIS",
+	NULL
+};
 static const BCharacterSet iso15(24,111,"ISO Latin 9","ISO-8859-15","ISO-8859-15",iso15aliases);
 
 // chinese character set testing
 
-static const char * big5aliases[] =
- { "csBig5",NULL };
+static const char * big5aliases[] = {
+	// IANA aliases
+	"csBig5",
+	NULL
+};
 static const BCharacterSet big5(25,2026,"Chinese Big5","Big5","Big5",big5aliases);
 
-static const BCharacterSet gb18030(26,114,"Chinese GB18030","GB18030",NULL,NULL);
+static const char * gb18030aliases[] = {
+	// java aliases
+	"gb18030-2000",
+	NULL
+};
+static const BCharacterSet gb18030(26,114,"Chinese GB18030","GB18030",NULL,gb18030aliases);
 
 /**
  * The following initializes the global character set array.
@@ -174,4 +311,3 @@ public:
 } runTheInitializer;
 
 }
-