diff --git a/src/modules/_Charset/misc.c b/src/modules/_Charset/misc.c
index 925a8a5fef08bef45f99f27a577429daf98dc296..6a7205f319369d6172ee19fa9a12f77162345294 100644
--- a/src/modules/_Charset/misc.c
+++ b/src/modules/_Charset/misc.c
@@ -1489,32 +1489,6 @@ p_wchar1 map_KSC5636[] = {
   0x006c, 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x0072, 0x0073,
   0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b,
   0x007c, 0x007d, 0x007e, 0x007f, };
-p_wchar1 map_latin_lap[] = {
-  0x00b4, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x02bf, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x0102, 0x00c2, 0x00c0, 0x0100, 0x01de, 0x01e0, 0x01e2, 0x0114,
-  0x00c8, 0x0112, 0x01e4, 0x01e6, 0x01e8, 0x014e, 0x00d2, 0x01ea,
-  0x01ec, 0x016a, 0x01b7, 0x01ee, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0x0103, 0x00e2, 0x00e0, 0x0101, 0x01df, 0x01e1, 0x01e3, 0x0115,
-  0x00e8, 0x0113, 0x01e5, 0x01e7, 0x01e9, 0x014f, 0x00f2, 0x01eb,
-  0x01ed, 0x016b, 0xe01e, 0x01ef, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
-  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, };
-p_wchar1 map_ISO_8859_10_1998[] = {
-  0x0104, 0x0112, 0x0122, 0x012a, 0x0128, 0x0136, 0x00a7, 0x013b,
-  0x0110, 0x0160, 0x0166, 0x017d, 0x00ad, 0x016a, 0x014a, 0x00b0,
-  0x0105, 0x0113, 0x0123, 0x012b, 0x0129, 0x0137, 0x00b7, 0x013c,
-  0x0111, 0x0161, 0x0167, 0x017e, 0x2015, 0x016b, 0x014b, 0x0100,
-  0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x012e, 0x010c,
-  0x00c9, 0x0118, 0x00cb, 0x0116, 0x00cd, 0x00ce, 0x00cf, 0x00d0,
-  0x0145, 0x014c, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x0168, 0x00d8,
-  0x0172, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df, 0x0101,
-  0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x012f, 0x010d,
-  0x00e9, 0x0119, 0x00eb, 0x0117, 0x00ed, 0x00ee, 0x00ef, 0x00f0,
-  0x0146, 0x014d, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x0169, 0x00f8,
-  0x0173, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x0138, };
 p_wchar1 map_macintosh[] = {
   0x00c4, 0x00c5, 0x00c7, 0x00c9, 0x00d1, 0x00d6, 0x00dc, 0x00e1,
   0x00e0, 0x00e2, 0x00e4, 0x00e3, 0x00e5, 0x00e7, 0x00e9, 0x00e8,
@@ -1845,13 +1819,10 @@ static struct {
   { "ibm905", map_IBM905, 32, 255 },
   { "ibm918", map_IBM918, 32, 255 },
   { "invariant", map_INVARIANT, 35, 127 },
-  { "iso-8859-10", map_ISO_8859_10_1998, 161, 255 },
   { "iso-ir-103", map_T_61_8bit, 33, 255 },
   { "iso-ir-128", map_T_101_G2, 33, 255 },
   { "iso-ir-150", map_greek_ccitt, 36, 127 },
   { "iso-ir-151", map_NC_NC00_10_81, 36, 127 },
-  { "iso-ir-157", map_ISO_8859_10_1998, 161, 255 },
-  { "iso-ir-158", map_latin_lap, 160, 255 },
   { "iso-ir-70", map_videotex_suppl, 33, 255 },
   { "iso-ir-90", map_iso_ir_90, 33, 255 },
   { "iso-ir-99", map_ANSI_X3_110_1983, 33, 255 },
@@ -1859,14 +1830,8 @@ static struct {
   { "iso646-dk", map_DS_2089, 91, 127 },
   { "iso646-kr", map_KSC5636, 92, 127 },
   { "iso_646.basic:1983", map_ISO_646_basic_1983, 35, 122 },
-  { "iso_8859-10", map_ISO_8859_10_1998, 161, 255 },
-  { "iso_8859-10:1998", map_ISO_8859_10_1998, 161, 255 },
   { "jis_x0201", map_JIS_X0201, 92, 255 },
   { "ksc5636", map_KSC5636, 92, 127 },
-  { "l6", map_ISO_8859_10_1998, 161, 255 },
-  { "lap", map_latin_lap, 160, 255 },
-  { "latin-lap", map_latin_lap, 160, 255 },
-  { "latin6", map_ISO_8859_10_1998, 161, 255 },
   { "mac", map_macintosh, 128, 255 },
   { "macintosh", map_macintosh, 128, 255 },
   { "naplps", map_ANSI_X3_110_1983, 33, 255 },
diff --git a/src/modules/_Charset/tables.c b/src/modules/_Charset/tables.c
index fc5a5eb46152f3e8ea8bb2ba96bfef94087b6eff..05786359b9ceefae3d55b8fe8a1b671482f36d04 100644
--- a/src/modules/_Charset/tables.c
+++ b/src/modules/_Charset/tables.c
@@ -812,6 +812,32 @@ const UNICHAR map_ISO_8859_9_1999[] = {
   0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
   0x011f, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7,
   0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x0131, 0x015f, 0x00ff, };
+const UNICHAR map_ISO_8859_10_1998[] = {
+  0x00a0, 0x0104, 0x0112, 0x0122, 0x012a, 0x0128, 0x0136, 0x00a7, 
+  0x013b, 0x0110, 0x0160, 0x0166, 0x017d, 0x00ad, 0x016a, 0x014a, 
+  0x00b0, 0x0105, 0x0113, 0x0123, 0x012b, 0x0129, 0x0137, 0x00b7, 
+  0x013c, 0x0111, 0x0161, 0x0167, 0x017e, 0x2015, 0x016b, 0x014b, 
+  0x0100, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x012e, 
+  0x010c, 0x00c9, 0x0118, 0x00cb, 0x0116, 0x00cd, 0x00ce, 0x00cf, 
+  0x00d0, 0x0145, 0x014c, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x0168, 
+  0x00d8, 0x0172, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df, 
+  0x0101, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x012f, 
+  0x010d, 0x00e9, 0x0119, 0x00eb, 0x0117, 0x00ed, 0x00ee, 0x00ef, 
+  0x00f0, 0x0146, 0x014d, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x0169, 
+  0x00f8, 0x0173, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x0138, };
+const UNICHAR map_ISO_8859_15_1999[] = {
+  0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x20ac, 0x00a5, 0x0160, 0x00a7, 
+  0x0161, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 
+  0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x017d, 0x00b5, 0x00b6, 0x00b7, 
+  0x017e, 0x00b9, 0x00ba, 0x00bb, 0x0152, 0x0153, 0x0178, 0x00bf, 
+  0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 
+  0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf, 
+  0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, 
+  0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df, 
+  0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 
+  0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, 
+  0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 
+  0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff, };
 const UNICHAR map_ISO_6937_2_25[] = {
   0x00a0, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
   0xfffd, 0xfffd, 0x201c, 0xfffd, 0x2190, 0x2191, 0x2192, 0x2193,
@@ -851,6 +877,19 @@ const UNICHAR map_ISO_8859_supp[] = {
   0x012b, 0x012f, 0x0133, 0x0135, 0x0137, 0x013c, 0x0140, 0x0146,
   0x0138, 0x014b, 0x014d, 0x0153, 0x0157, 0x015d, 0x0167, 0x00fe,
   0x0169, 0x016d, 0x016b, 0x0173, 0x0175, 0x00fd, 0x0177, 0x0149, };
+const UNICHAR map_latin_lap[] = {
+  0x00b4, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
+  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
+  0x02bf, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
+  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
+  0x0102, 0x00c2, 0x00c0, 0x0100, 0x01de, 0x01e0, 0x01e2, 0x0114,
+  0x00c8, 0x0112, 0x01e4, 0x01e6, 0x01e8, 0x014e, 0x00d2, 0x01ea,
+  0x01ec, 0x016a, 0x01b7, 0x01ee, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
+  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
+  0x0103, 0x00e2, 0x00e0, 0x0101, 0x01df, 0x01e1, 0x01e3, 0x0115,
+  0x00e8, 0x0113, 0x01e5, 0x01e7, 0x01e9, 0x014f, 0x00f2, 0x01eb,
+  0x01ed, 0x016b, 0xe01e, 0x01ef, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
+  0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, };
 const UNICHAR map_ISO_10367_box[] = {
   0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
   0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
@@ -6417,8 +6456,8 @@ const UNICHAR *iso2022_96[] = {
   map_ISO_8859_8_1999, map_CSN_369103, map_ISO_6937_2_add, map_IEC_P27_1, 
   map_ISO_8859_5_1999, map_ISO_8859_9_1999, map_ISO_6937_2_25, map_GOST_19768_74, 
   map_ISO_8859_supp, map_ISO_10367_box, NULL, NULL, 
-  NULL, NULL, NULL, NULL, 
-  NULL, NULL, NULL, NULL, 
+  NULL, NULL, map_ISO_8859_10_1998, NULL, 
+  map_latin_lap, NULL, NULL, NULL, 
   NULL, NULL, NULL, NULL, 
   NULL, NULL, NULL, NULL, 
   NULL, NULL, NULL, NULL, 
@@ -6505,6 +6544,8 @@ const struct charset_def charset_map[] = {
   { "iso-8859-7", map_ISO_8859_7_1987, MODE_96 },
   { "iso-8859-8", map_ISO_8859_8_1999, MODE_96 },
   { "iso-8859-9", map_ISO_8859_9_1999, MODE_96 },
+  { "iso-8859-10", map_ISO_8859_10_1998, MODE_96 },
+  { "iso-8859-15", map_ISO_8859_15_1999, MODE_96 },
   { "iso-ir-10", map_SEN_850200_B, MODE_94 },
   { "iso-ir-100", map_ISO_8859_1_1998, MODE_96 },
   { "iso-ir-101", map_ISO_8859_2_1999, MODE_96 },
@@ -6535,12 +6576,15 @@ const struct charset_def charset_map[] = {
   { "iso-ir-153", map_GOST_19768_74, MODE_96 },
   { "iso-ir-154", map_ISO_8859_supp, MODE_96 },
   { "iso-ir-155", map_ISO_10367_box, MODE_96 },
+  { "iso-ir-157", map_ISO_8859_10_1998, MODE_96 },
+  { "iso-ir-158", map_latin_lap, MODE_96 },
   { "iso-ir-159", map_JIS_X0212_1990, MODE_9494 },
   { "iso-ir-16", map_PT, MODE_94 },
   { "iso-ir-17", map_ES, MODE_94 },
   { "iso-ir-18", map_greek7_old, MODE_94 },
   { "iso-ir-19", map_latin_greek, MODE_94 },
   { "iso-ir-2", map_ISO_646_irv_1983, MODE_94 },
+  { "iso-ir-203", map_ISO_8859_15_1999, MODE_96 },
   { "iso-ir-21", map_DIN_66003, MODE_94 },
   { "iso-ir-25", map_NF_Z_62_010_1973, MODE_94 },
   { "iso-ir-27", map_Latin_greek_1, MODE_94 },
@@ -6630,6 +6674,10 @@ const struct charset_def charset_map[] = {
   { "iso_8859-8:1999", map_ISO_8859_8_1999, MODE_96 },
   { "iso_8859-9", map_ISO_8859_9_1999, MODE_96 },
   { "iso_8859-9:1999", map_ISO_8859_9_1999, MODE_96 },
+  { "iso_8859-10", map_ISO_8859_10_1998, MODE_96 },
+  { "iso_8859-10:1998", map_ISO_8859_10_1998, MODE_96 },
+  { "iso_8859-15", map_ISO_8859_15_1999, MODE_96 },
+  { "iso_8859-15:1999", map_ISO_8859_15_1999, MODE_96 },
   { "iso_8859-supp", map_ISO_8859_supp, MODE_96 },
   { "iso_9036", map_ASMO_449, MODE_94 },
   { "it", map_IT, MODE_94 },
@@ -6666,6 +6714,9 @@ const struct charset_def charset_map[] = {
   { "l3", map_ISO_8859_3_1999, MODE_96 },
   { "l4", map_ISO_8859_4_1998, MODE_96 },
   { "l5", map_ISO_8859_9_1999, MODE_96 },
+  { "l6", map_ISO_8859_10_1998, MODE_96 },
+  { "l9", map_ISO_8859_15_1999, MODE_96 },
+  { "lap", map_latin_lap, MODE_96 },
   { "latin-greek", map_latin_greek, MODE_94 },
   { "latin-greek-1", map_Latin_greek_1, MODE_94 },
   { "latin1", map_ISO_8859_1_1998, MODE_96 },
@@ -6674,6 +6725,8 @@ const struct charset_def charset_map[] = {
   { "latin3", map_ISO_8859_3_1999, MODE_96 },
   { "latin4", map_ISO_8859_4_1998, MODE_96 },
   { "latin5", map_ISO_8859_9_1999, MODE_96 },
+  { "latin6", map_ISO_8859_10_1998, MODE_96 },
+  { "latin9", map_ISO_8859_15_1999, MODE_96 },
   { "macedonian", map_JUS_I_B1_003_mac, MODE_94 },
   { "msz_7795.3", map_MSZ_7795_3, MODE_94 },
   { "nats-dano", map_NATS_DANO, MODE_94 },