diff --git a/src/modules/_Charset/tables.c b/src/modules/_Charset/tables.c
index 05786359b9ceefae3d55b8fe8a1b671482f36d04..627672509eb5d021c219597a8fb90e8ceb84156c 100644
--- a/src/modules/_Charset/tables.c
+++ b/src/modules/_Charset/tables.c
@@ -813,18 +813,44 @@ const UNICHAR map_ISO_8859_9_1999[] = {
   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, 
+  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_13_1998[] = {
+  0x00a0, 0x201d, 0x00a2, 0x00a3, 0x00a4, 0x201e, 0x00a6, 0x00a7,
+  0x00d8, 0x00a9, 0x0156, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00c6,
+  0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x201c, 0x00b5, 0x00b6, 0x00b7,
+  0x00f8, 0x00b9, 0x0157, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00e6,
+  0x0104, 0x012e, 0x0100, 0x0106, 0x00c4, 0x00c5, 0x0118, 0x0112,
+  0x010c, 0x00c9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012a, 0x013b,
+  0x0160, 0x0143, 0x0145, 0x00d3, 0x014c, 0x00d5, 0x00d6, 0x00d7,
+  0x0172, 0x0141, 0x015a, 0x016a, 0x00dc, 0x017b, 0x017d, 0x00df,
+  0x0105, 0x012f, 0x0101, 0x0107, 0x00e4, 0x00e5, 0x0119, 0x0113,
+  0x010d, 0x00e9, 0x017a, 0x0117, 0x0123, 0x0137, 0x012b, 0x013c,
+  0x0161, 0x0144, 0x0146, 0x00f3, 0x014d, 0x00f5, 0x00f6, 0x00f7,
+  0x0173, 0x0142, 0x015b, 0x016b, 0x00fc, 0x017c, 0x017e, 0x2019, }; 
+const UNICHAR map_ISO_8859_14_1998[] = {
+  0x00a0, 0x1e02, 0x1e03, 0x00a3, 0x010a, 0x010b, 0x1e0a, 0x00a7,
+  0x1e80, 0x00a9, 0x1e82, 0x1e0b, 0x1ef2, 0x00ad, 0x00ae, 0x0178,
+  0x1e1e, 0x1e1f, 0x0120, 0x0121, 0x1e40, 0x1e41, 0x00b6, 0x1e56,
+  0x1e81, 0x1e57, 0x1e83, 0x1e60, 0x1ef3, 0x1e84, 0x1e85, 0x1e61,
+  0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7,
+  0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
+  0x0174, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x1e6a,
+  0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x0176, 0x00df,
+  0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7,
+  0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
+  0x0175, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x1e6b,
+  0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x0177, 0x00ff, };
 const UNICHAR map_ISO_8859_15_1999[] = {
   0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x20ac, 0x00a5, 0x0160, 0x00a7, 
   0x0161, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 
@@ -6457,9 +6483,9 @@ const UNICHAR *iso2022_96[] = {
   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, map_ISO_8859_10_1998, NULL, 
-  map_latin_lap, NULL, NULL, NULL, 
-  NULL, NULL, NULL, NULL, 
-  NULL, NULL, NULL, NULL, 
+  map_latin_lap, map_ISO_8859_13_1998, NULL, NULL, 
+  NULL, NULL, NULL, map_ISO_8859_14_1998, 
+  NULL, NULL, map_ISO_8859_15_1999, NULL, 
   NULL, NULL, NULL, NULL, 
   NULL, NULL, NULL, NULL, 
   NULL, NULL, NULL, NULL, 
@@ -6496,6 +6522,7 @@ const struct charset_def charset_map[] = {
   { "bs_4730", map_BS_4730, MODE_94 },
   { "bs_viewdata", map_BS_viewdata, MODE_94 },
   { "ca", map_CSA_Z243_4_1985_1, MODE_94 },
+  { "celtic", map_ISO_8859_14_1998, MODE_96 },
   { "chinese", map_GB_2312_80, MODE_9494 },
   { "cn", map_GB_1988_80, MODE_94 },
   { "cp367", map_ANSI_X3_4_1968, MODE_94 },
@@ -6545,6 +6572,8 @@ const struct charset_def charset_map[] = {
   { "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-13", map_ISO_8859_13_1998, MODE_96 },
+  { "iso-8859-14", map_ISO_8859_14_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 },
@@ -6581,8 +6610,10 @@ const struct charset_def charset_map[] = {
   { "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-179", map_ISO_8859_13_1998, MODE_96 },
   { "iso-ir-18", map_greek7_old, MODE_94 },
   { "iso-ir-19", map_latin_greek, MODE_94 },
+  { "iso-ir-199", map_ISO_8859_14_1998, MODE_96 },
   { "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 },
@@ -6676,6 +6707,10 @@ const struct charset_def charset_map[] = {
   { "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-13", map_ISO_8859_13_1998, MODE_96 },
+  { "iso_8859-13:1998", map_ISO_8859_13_1998, MODE_96 },
+  { "iso_8859-14", map_ISO_8859_14_1998, MODE_96 },
+  { "iso_8859-14:1998", map_ISO_8859_14_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 },
@@ -6715,6 +6750,8 @@ const struct charset_def charset_map[] = {
   { "l4", map_ISO_8859_4_1998, MODE_96 },
   { "l5", map_ISO_8859_9_1999, MODE_96 },
   { "l6", map_ISO_8859_10_1998, MODE_96 },
+  { "l7", map_ISO_8859_13_1998, MODE_96 },
+  { "l8", map_ISO_8859_14_1998, MODE_96 },
   { "l9", map_ISO_8859_15_1999, MODE_96 },
   { "lap", map_latin_lap, MODE_96 },
   { "latin-greek", map_latin_greek, MODE_94 },
@@ -6726,6 +6763,8 @@ const struct charset_def charset_map[] = {
   { "latin4", map_ISO_8859_4_1998, MODE_96 },
   { "latin5", map_ISO_8859_9_1999, MODE_96 },
   { "latin6", map_ISO_8859_10_1998, MODE_96 },
+  { "latin7", map_ISO_8859_13_1998, MODE_96 },
+  { "latin8", map_ISO_8859_14_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 },