diff --git a/etc/ChangeLog b/etc/ChangeLog
index f5cdad884c34d328c80f9698c1bb095c04184d8d..701727d935417105b54ec9dca80983074fc69d34 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-12  Kenichi Handa  <handa@m17n.org>
+
+	* charsets/*.map: All re-generated.
+
+2009-06-08  Kenichi Handa  <handa@m17n.org>
+
+	* HELLO: Downcase "suomi".
+
 2009-05-25  Werner Lemberg  <wl@gnu.org>
 
 	* tutorial/TUTORIAL.de: Updated; synchronize with TUTORIAL.
diff --git a/etc/charsets/8859-10.map b/etc/charsets/8859-10.map
index 274d7d8dcd9658f51512f9897a8ec902a4974fef..0fea7c6065f11c34470dfe7e7a11e32e92ecf344 100644
--- a/etc/charsets/8859-10.map
+++ b/etc/charsets/8859-10.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-10
+# Generated from ISO-8859-10 in localedate/charmaps of glibc
 0x00-0xA0 0x0000
 0xA1 0x0104
 0xA2 0x0112
diff --git a/etc/charsets/8859-11.map b/etc/charsets/8859-11.map
index 0cf1dc5df5e69ffa2b3496edf8f4edb315dd9609..0ac6c1b62ce989a0aafec2d027b56ef70b45f0c9 100644
--- a/etc/charsets/8859-11.map
+++ b/etc/charsets/8859-11.map
@@ -1,5 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-11
-0x00-0x7F 0x0000
-0xA0 0x00A0
+# Generated from ISO-8859-11 in localedate/charmaps of glibc
+0x00-0xA0 0x0000
 0xA1-0xDA 0x0E01
 0xDF-0xFB 0x0E3F
diff --git a/etc/charsets/8859-13.map b/etc/charsets/8859-13.map
index 73cbb253b4d751b699f787ce5d594dfafe43f0f2..aa79e3903eaead06434500bad54d091572e9c3a6 100644
--- a/etc/charsets/8859-13.map
+++ b/etc/charsets/8859-13.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-13
+# Generated from ISO-8859-13 in localedate/charmaps of glibc
 0x00-0xA0 0x0000
 0xA1 0x201D
 0xA2-0xA4 0x00A2
diff --git a/etc/charsets/8859-14.map b/etc/charsets/8859-14.map
index 7ed135c978799adc633cd50b07bb06ff88cdf96b..121c8cda4fbb59a00657b27bf2ea11343f51804a 100644
--- a/etc/charsets/8859-14.map
+++ b/etc/charsets/8859-14.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-14
+# Generated from ISO-8859-14 in localedate/charmaps of glibc
 0x00-0xA0 0x0000
 0xA1-0xA2 0x1E02
 0xA3 0x00A3
diff --git a/etc/charsets/8859-15.map b/etc/charsets/8859-15.map
index 621865c73d5640afb8b94c9f18e7a3a2601853d3..6880fef787528d6f45ac52d85c8f79203ca76049 100644
--- a/etc/charsets/8859-15.map
+++ b/etc/charsets/8859-15.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-15
+# Generated from ISO-8859-15 in localedate/charmaps of glibc
 0x00-0xA3 0x0000
 0xA4 0x20AC
 0xA5 0x00A5
diff --git a/etc/charsets/8859-16.map b/etc/charsets/8859-16.map
index 77360ceb9e2a0a8ec02c03d165c7d5ef839594cf..a82b0859dc3661a8f7d24424402f1edcdafbc84d 100644
--- a/etc/charsets/8859-16.map
+++ b/etc/charsets/8859-16.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-16
+# Generated from ISO-8859-16 in localedate/charmaps of glibc
 0x00-0xA0 0x0000
 0xA1-0xA2 0x0104
 0xA3 0x0141
diff --git a/etc/charsets/8859-2.map b/etc/charsets/8859-2.map
index 7fecd2474555d0e945cbef576825b55d4bb26e55..9895f9ce0baa9616d2c97ea10dc254d8fa4e9da8 100644
--- a/etc/charsets/8859-2.map
+++ b/etc/charsets/8859-2.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-2
+# Generated from ISO-8859-2 in localedate/charmaps of glibc
 0x00-0xA0 0x0000
 0xA1 0x0104
 0xA2 0x02D8
diff --git a/etc/charsets/8859-3.map b/etc/charsets/8859-3.map
index 224e6d5248c14d0c0ed8cafe753e1a9d18105a26..9f27cc3228541f5e034ecb95a81cc43ee8495d5f 100644
--- a/etc/charsets/8859-3.map
+++ b/etc/charsets/8859-3.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-3
+# Generated from ISO-8859-3 in localedate/charmaps of glibc
 0x00-0xA0 0x0000
 0xA1 0x0126
 0xA2 0x02D8
diff --git a/etc/charsets/8859-4.map b/etc/charsets/8859-4.map
index 57761ce9785c880689d4226802a7b11fc0fdfa76..a786c6fb09c90689389ead7b66f916d6f6c874c1 100644
--- a/etc/charsets/8859-4.map
+++ b/etc/charsets/8859-4.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-4
+# Generated from ISO-8859-4 in localedate/charmaps of glibc
 0x00-0xA0 0x0000
 0xA1 0x0104
 0xA2 0x0138
diff --git a/etc/charsets/8859-5.map b/etc/charsets/8859-5.map
index 1de2035ba22132a7bfe6628a87825da99554acb6..d68a8f21bf898e9c5e0679910675862e1143ae30 100644
--- a/etc/charsets/8859-5.map
+++ b/etc/charsets/8859-5.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-5
+# Generated from ISO-8859-5 in localedate/charmaps of glibc
 0x00-0xA0 0x0000
 0xA1-0xAC 0x0401
 0xAD 0x00AD
diff --git a/etc/charsets/8859-6.map b/etc/charsets/8859-6.map
index ab577961ee4cf3481f73cc3ff08ef9d7cfc85f4d..c7302e1171359f59d3f41376234843d5f5edb389 100644
--- a/etc/charsets/8859-6.map
+++ b/etc/charsets/8859-6.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-6
+# Generated from ISO-8859-6 in localedate/charmaps of glibc
 0x00-0xA0 0x0000
 0xA4 0x00A4
 0xAC 0x060C
diff --git a/etc/charsets/8859-7.map b/etc/charsets/8859-7.map
index 9f196c3aa7099e460b6633fe24a600a3e2b892a3..934e6a762462fc29304aecea5a350fcac596ffd5 100644
--- a/etc/charsets/8859-7.map
+++ b/etc/charsets/8859-7.map
@@ -1,8 +1,11 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-7
+# Generated from ISO-8859-7 in localedate/charmaps of glibc
 0x00-0xA0 0x0000
 0xA1-0xA2 0x2018
 0xA3 0x00A3
+0xA4 0x20AC
+0xA5 0x20AF
 0xA6-0xA9 0x00A6
+0xAA 0x037A
 0xAB-0xAD 0x00AB
 0xAF 0x2015
 0xB0-0xB3 0x00B0
diff --git a/etc/charsets/8859-8.map b/etc/charsets/8859-8.map
index 4f539168e32fe9cbbe8b5de5911427de101e7d8c..65b47ed102ea4e064f28b2c82658065c302e0c7c 100644
--- a/etc/charsets/8859-8.map
+++ b/etc/charsets/8859-8.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-8
+# Generated from ISO-8859-8 in localedate/charmaps of glibc
 0x00-0xA0 0x0000
 0xA2-0xA9 0x00A2
 0xAA 0x00D7
diff --git a/etc/charsets/8859-9.map b/etc/charsets/8859-9.map
index 6649f289ff5dbbfa92f7cfedd7da5a3b753343e1..8dab0e0bbfa17924e69cd52309737053045d7e4f 100644
--- a/etc/charsets/8859-9.map
+++ b/etc/charsets/8859-9.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/ISO-8859-9
+# Generated from ISO-8859-9 in localedate/charmaps of glibc
 0x00-0xCF 0x0000
 0xD0 0x011E
 0xD1-0xDC 0x00D1
diff --git a/etc/charsets/ALTERNATIVNYJ.map b/etc/charsets/ALTERNATIVNYJ.map
index cc57de3d01520b36c67cb3702cae6cb3fa4cd1c0..9e1186cdd263f5abcebab54e7cca5cadd454b751 100644
--- a/etc/charsets/ALTERNATIVNYJ.map
+++ b/etc/charsets/ALTERNATIVNYJ.map
@@ -1,7 +1,6 @@
-# Modified from ibm866 according to the chart at
+# Modified from IBM866.map according to the chart at
 # http://www.cyrillic.com/ref/cyrillic/koi-8alt.html,
 # with guesses for the Unicodes of the glyphs.
-# Generated from glibc-2.3.2/localedata/charmaps/IBM866
 0x00-0x7F 0x0000
 0x80-0xAF 0x0410
 0xB0-0xB2 0x2591
diff --git a/etc/charsets/BIG5-1.map b/etc/charsets/BIG5-1.map
index 22fd7d1ff2daf6b01053877b30e3340458c98e03..8b9581a6cf89c71d089d6b5f721ea4d402655a71 100644
--- a/etc/charsets/BIG5-1.map
+++ b/etc/charsets/BIG5-1.map
@@ -1,4 +1,4 @@
-Generated from BIG5.map
+# Generated from BIG5.map
 0x2121 0x3000
 0x2122 0xFF0C
 0x2123 0x3001
diff --git a/etc/charsets/BIG5-2.map b/etc/charsets/BIG5-2.map
index 03701c0c38e91fb6d370a13942af966c92fa29e5..e6bc20b252913ac6f75ea2e1add42db7624f81a5 100644
--- a/etc/charsets/BIG5-2.map
+++ b/etc/charsets/BIG5-2.map
@@ -1,4 +1,4 @@
-Generated from BIG5.map
+# Generated from BIG5.map
 0x2121 0x4E42
 0x2122 0x4E5C
 0x2123 0x51F5
diff --git a/etc/charsets/BIG5-HKSCS.map b/etc/charsets/BIG5-HKSCS.map
index 4d7f87a28833236931f839fc6d3df36602877cf0..acf815d55c0ff82164d9c7f088d7b3c22568371c 100644
--- a/etc/charsets/BIG5-HKSCS.map
+++ b/etc/charsets/BIG5-HKSCS.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/BIG5-HKSCS
+# Generated from BIG5-HKSCS in localedate/charmaps of glibc
 0x8840-0x8855 0xF303
 0x8856 0x0100
 0x8857 0x00C1
diff --git a/etc/charsets/BIG5.map b/etc/charsets/BIG5.map
index e4bd5af2e68f5e69cf4c40076db8f86f1637abf1..30684fddbdea406db72fe268df2b896696b9acbc 100644
--- a/etc/charsets/BIG5.map
+++ b/etc/charsets/BIG5.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/BIG5
+# Generated from BIG5 in localedate/charmaps of glibc
 0xa140 0x3000
 0xa141 0xFF0C
 0xa142 0x3001
diff --git a/etc/charsets/CNS-1.map b/etc/charsets/CNS-1.map
index 2f0e5c5c8a0c3491c51a6d3bdee911afaae4102d..7fabe9edf6ac8c7e4dcc365fae367c0914b45069 100644
--- a/etc/charsets/CNS-1.map
+++ b/etc/charsets/CNS-1.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/EUC-TW
+# Generated from EUC-TW in localedate/charmaps of glibc
 0x2121 0x3000
 0x2122 0xFF0C
 0x2123-0x2124 0x3001
diff --git a/etc/charsets/CNS-2.map b/etc/charsets/CNS-2.map
index d1c95f6e149fb1fbcbd0188b1c6e16927115ac56..7fdd4ae04980ef863dfc5b40f8e04fdc5544bf4d 100644
--- a/etc/charsets/CNS-2.map
+++ b/etc/charsets/CNS-2.map
@@ -1,4 +1,5 @@
-# Generated from data at http://sourceforge.net/cvs/?group_id=26261
+# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
+# http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
 0x2121 0x4E42
 0x2122 0x4E5C
 0x2123 0x51F5
diff --git a/etc/charsets/CNS-3.map b/etc/charsets/CNS-3.map
index 68965c4c68bad4ec9e6ee25338d373d1ac6ccd59..f1542f9da9138315ea3ced95337ef3f017d56118 100644
--- a/etc/charsets/CNS-3.map
+++ b/etc/charsets/CNS-3.map
@@ -1,4 +1,5 @@
-# Generated from data at http://sourceforge.net/cvs/?group_id=26261
+# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
+# http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
 0x2121 0x4E28
 0x2122 0x4E36
 0x2123 0x4E3F
diff --git a/etc/charsets/CNS-4.map b/etc/charsets/CNS-4.map
index fac07103ab979ce7d58bde93ae4a127407b0639d..8f9f2333c958e926c5677d655a5eb4336f5e343f 100644
--- a/etc/charsets/CNS-4.map
+++ b/etc/charsets/CNS-4.map
@@ -1,4 +1,5 @@
-# Generated from data at http://sourceforge.net/cvs/?group_id=26261
+# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
+# http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
 0x2121 0x20086
 0x2122-0x2123 0x4E40
 0x2124 0x4E5A
diff --git a/etc/charsets/CNS-5.map b/etc/charsets/CNS-5.map
index f8095275bd75b0b12c6557c9b4cd21fc3aecb9b7..c893f164961bf39440ad2c8c06119d19286339bd 100644
--- a/etc/charsets/CNS-5.map
+++ b/etc/charsets/CNS-5.map
@@ -1,4 +1,5 @@
-# Generated from data at http://sourceforge.net/cvs/?group_id=26261
+# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
+# http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
 0x2121 0x200D1
 0x2122 0x200CB
 0x2123 0x200C9
diff --git a/etc/charsets/CNS-6.map b/etc/charsets/CNS-6.map
index 2a25ae25d07079e96bcb2b2ce3ba59dda5c6cfa9..90c048035c0efa8b676eb137cd9218267bfedde1 100644
--- a/etc/charsets/CNS-6.map
+++ b/etc/charsets/CNS-6.map
@@ -1,4 +1,5 @@
-# Generated from data at http://sourceforge.net/cvs/?group_id=26261
+# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
+# http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
 0x2121 0x2F802
 0x2122 0x20062
 0x2123 0x3405
diff --git a/etc/charsets/CNS-7.map b/etc/charsets/CNS-7.map
index 33b65e852a2dae573d03fc93cab9bdb1952bb776..96c1ad0efed32e22a6350f13d8407ff32c078c0f 100644
--- a/etc/charsets/CNS-7.map
+++ b/etc/charsets/CNS-7.map
@@ -1,4 +1,5 @@
-# Generated from data at http://sourceforge.net/cvs/?group_id=26261
+# Generated from admin/charsets/mapfiles/cns2ucsdkw.txt.gz which is a copy of
+# http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4
 0x2121 0x20055
 0x2122 0x20182
 0x2123 0x20189
diff --git a/etc/charsets/CNS-F.map b/etc/charsets/CNS-F.map
index 56601273412c1191b94dbacb607df0054de80762..d36ddc95fda6572f5103af543d435fe85ccc0236 100644
--- a/etc/charsets/CNS-F.map
+++ b/etc/charsets/CNS-F.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/EUC-TW
+# Generated from EUC-TW in localedate/charmaps of glibc
 0x2121 0x20002
 0x2122 0x2008C
 0x2123 0x200D4
diff --git a/etc/charsets/CP10007.map b/etc/charsets/CP10007.map
index f542583795caaa83d18bc144dca807a198caa4a5..9c30370ad526a43c43a43ada22758aaa2303955d 100644
--- a/etc/charsets/CP10007.map
+++ b/etc/charsets/CP10007.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP10007
+# Generated from CP10007 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80-0x9F 0x0410
 0xA0 0x2020
diff --git a/etc/charsets/CP1125.map b/etc/charsets/CP1125.map
index 12b8d1384f945f18a3960497bc080cfe15b56c37..29b1b36670e3224bf940a42f762e2a94ce29c5cd 100644
--- a/etc/charsets/CP1125.map
+++ b/etc/charsets/CP1125.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP1125
+# Generated from CP1125 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80-0xAF 0x0410
 0xB0-0xB2 0x2591
diff --git a/etc/charsets/CP1250.map b/etc/charsets/CP1250.map
index 831696932223f530484adef0aab88f1d6e45f7e9..b838832ef153fd62400c38d2ba2a328129632073 100644
--- a/etc/charsets/CP1250.map
+++ b/etc/charsets/CP1250.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP1250
+# Generated from CP1250 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x20AC
 0x82 0x201A
diff --git a/etc/charsets/CP1251.map b/etc/charsets/CP1251.map
index 9a980a4ece03ffca5bfe5cd49f15df9bfb251924..dcc20e7cf70f2f508fcbc721b78c878e48b8d132 100644
--- a/etc/charsets/CP1251.map
+++ b/etc/charsets/CP1251.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP1251
+# Generated from CP1251 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80-0x81 0x0402
 0x82 0x201A
diff --git a/etc/charsets/CP1252.map b/etc/charsets/CP1252.map
index 1e60d9eaedfa51ba2346f4bd88f7acf13a519056..d158ced40485c2e78759f5f5d05d6c8a5ee436fa 100644
--- a/etc/charsets/CP1252.map
+++ b/etc/charsets/CP1252.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP1252
+# Generated from CP1252 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x20AC
 0x82 0x201A
diff --git a/etc/charsets/CP1253.map b/etc/charsets/CP1253.map
index d83fce2d0f5833154f3a2ea1a324995381f5822f..c31df17550cca6a167b1b1f5d0bacb88945e678e 100644
--- a/etc/charsets/CP1253.map
+++ b/etc/charsets/CP1253.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP1253
+# Generated from CP1253 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x20AC
 0x82 0x201A
diff --git a/etc/charsets/CP1254.map b/etc/charsets/CP1254.map
index c50d647621763421ead2cfa5a2c4be23314070ad..0701e4375591e614187bf3cc290b479f5e88caf9 100644
--- a/etc/charsets/CP1254.map
+++ b/etc/charsets/CP1254.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP1254
+# Generated from CP1254 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x20AC
 0x82 0x201A
diff --git a/etc/charsets/CP1255.map b/etc/charsets/CP1255.map
index 0dbbe816e8e0f773caed704e29186dd234682a93..37d53e9c907944fc41505eabebc7acca7dcebfea 100644
--- a/etc/charsets/CP1255.map
+++ b/etc/charsets/CP1255.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP1255
+# Generated from CP1255 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x20AC
 0x82 0x201A
diff --git a/etc/charsets/CP1256.map b/etc/charsets/CP1256.map
index ee6e0a1fb8f0f3aaed10d97582f7a187153098da..7db072cc9656d49dac591faacd3ee773ec7458a2 100644
--- a/etc/charsets/CP1256.map
+++ b/etc/charsets/CP1256.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP1256
+# Generated from CP1256 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x20AC
 0x81 0x067E
diff --git a/etc/charsets/CP1257.map b/etc/charsets/CP1257.map
index 30af7060f424c594983e9a5cae12338fcd996d97..1cfc7b624bd5d63e18e7ed413de022076c02cee6 100644
--- a/etc/charsets/CP1257.map
+++ b/etc/charsets/CP1257.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP1257
+# Generated from CP1257 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x20AC
 0x82 0x201A
diff --git a/etc/charsets/CP1258.map b/etc/charsets/CP1258.map
index 0193917716a03de3045b458e7107747a895d78bd..1a321800de13fc78c0339250f1e2ded0ce146db6 100644
--- a/etc/charsets/CP1258.map
+++ b/etc/charsets/CP1258.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP1258
+# Generated from CP1258 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x20AC
 0x82 0x201A
diff --git a/etc/charsets/CP720.map b/etc/charsets/CP720.map
index 9c3937ce05f29b51d3af423d6d4cd4415a85c30c..e27deac7eeeda231ba30122c888f6791e82f4452 100644
--- a/etc/charsets/CP720.map
+++ b/etc/charsets/CP720.map
@@ -1,14 +1,18 @@
-# Generated from http://www.microsoft.com/globaldev/reference/oem/720.htm
+# Created manually from <http://en.wikipedia.org/wiki/Code_page_720>.
+# The text in that page is available under the terms of the GNU Free
+# Documentation License.
 0x00-0x7F 0x0000
 0x82 0x00E9
 0x83 0x00E2
 0x85 0x00E0
 0x87 0x00E7
-0x88-0x89 0x00EA
+0x88 0x00EA
+0x89 0x00EB
 0x8A 0x00E8
 0x8B 0x00EF
 0x8C 0x00EE
-0x91-0x92 0x0651
+0x91 0x0651
+0x92 0x0652
 0x93 0x00F4
 0x94 0x00A4
 0x95 0x0640
@@ -22,7 +26,8 @@
 0xB0-0xB2 0x2591
 0xB3 0x2502
 0xB4 0x2524
-0xB5-0xB6 0x2561
+0xB5 0x2561
+0xB6 0x2562
 0xB7 0x2556
 0xB8 0x2555
 0xB9 0x2563
@@ -38,7 +43,8 @@
 0xC3 0x251C
 0xC4 0x2500
 0xC5 0x253C
-0xC6-0xC7 0x255E
+0xC6 0x255E
+0xC7 0x255F
 0xC8 0x255A
 0xC9 0x2554
 0xCA 0x2569
@@ -46,11 +52,14 @@
 0xCC 0x2560
 0xCD 0x2550
 0xCE 0x256C
-0xCF-0xD0 0x2567
-0xD1-0xD2 0x2564
+0xCF 0x2567
+0xD0 0x2568
+0xD1 0x2564
+0xD2 0x2565
 0xD3 0x2559
 0xD4 0x2558
-0xD5-0xD6 0x2552
+0xD5 0x2552
+0xD6 0x2553
 0xD7 0x256B
 0xD8 0x256A
 0xD9 0x2518
diff --git a/etc/charsets/CP737.map b/etc/charsets/CP737.map
index 05a401d552b8e9ac80a8f96050c47c2756a1f648..f7fc9992826b5675c5d1139b8b29afd3e4ff80e9 100644
--- a/etc/charsets/CP737.map
+++ b/etc/charsets/CP737.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP737
+# Generated from CP737 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80-0x90 0x0391
 0x91-0x97 0x03A3
diff --git a/etc/charsets/CP775.map b/etc/charsets/CP775.map
index dabe9c7810d23aaa95bb8d099db6dbdba313b81e..dee60a645044659168beeb156600adc52d5a21b8 100644
--- a/etc/charsets/CP775.map
+++ b/etc/charsets/CP775.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP775
+# Generated from CP775 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x0106
 0x81 0x00FC
diff --git a/etc/charsets/CP858.map b/etc/charsets/CP858.map
index 2a2c9e6abfe3f1ec9eb765e62158fb06c5e69cef..753dc50946eeaadeaadda297e24f8a7ea3a0f49b 100644
--- a/etc/charsets/CP858.map
+++ b/etc/charsets/CP858.map
@@ -1,4 +1,6 @@
-# Generated from http://www.microsoft.com/globaldev/reference/oem/858.htm
+# Created manually from <http://en.wikipedia.org/wiki/Code_page_858>.
+# The text in that page is available under the terms of the GNU Free
+# Documentation License.
 0x00-0x7F 0x0000
 0x80 0x00C7
 0x81 0x00FC
@@ -8,12 +10,14 @@
 0x85 0x00E0
 0x86 0x00E5
 0x87 0x00E7
-0x88-0x89 0x00EA
+0x88 0x00EA
+0x89 0x00EB
 0x8A 0x00E8
 0x8B 0x00EF
 0x8C 0x00EE
 0x8D 0x00EC
-0x8E-0x8F 0x00C4
+0x8E 0x00C4
+0x8F 0x00C5
 0x90 0x00C9
 0x91 0x00E6
 0x92 0x00C6
@@ -46,10 +50,13 @@
 0xAD 0x00A1
 0xAE 0x00AB
 0xAF 0x00BB
-0xB0-0xB2 0x2591
+0xB0 0x2591
+0xB1 0x2592
+0xB2 0x2593
 0xB3 0x2502
 0xB4 0x2524
-0xB5-0xB6 0x00C1
+0xB5 0x00C1
+0xB6 0x00C2
 0xB7 0x00C0
 0xB8 0x00A9
 0xB9 0x2563
@@ -77,10 +84,13 @@
 0xCF 0x00A4
 0xD0 0x00F0
 0xD1 0x00D0
-0xD2-0xD3 0x00CA
+0xD2 0x00CA
+0xD3 0x00CB
 0xD4 0x00C8
 0xD5 0x20AC
-0xD6-0xD8 0x00CD
+0xD6 0x00CD
+0xD7 0x00CE
+0xD8 0x00CF
 0xD9 0x2518
 0xDA 0x250C
 0xDB 0x2588
@@ -97,7 +107,8 @@
 0xE6 0x00B5
 0xE7 0x00FE
 0xE8 0x00DE
-0xE9-0xEA 0x00DA
+0xE9 0x00DA
+0xEA 0x00DB
 0xEB 0x00D9
 0xEC 0x00FD
 0xED 0x00DD
diff --git a/etc/charsets/CP932-2BYTE.map b/etc/charsets/CP932-2BYTE.map
index cc04e8fcfa5720a8d2845380ee5ef6147bfaae91..045fdc98659c52c8e2c24ac2258e8ff9bad82155 100644
--- a/etc/charsets/CP932-2BYTE.map
+++ b/etc/charsets/CP932-2BYTE.map
@@ -1,4 +1,5 @@
-# Generated from http://www.unicode.org/Public/MAPPINGS/.../cp932.txt
+# Generated from admin/charsets/mapfiles/CP932.TXT.gz which is a copy of
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT
 0x8140 0x3000 # 0 2121
 0x8141 0x3001 # 0 2122
 0x8142 0x3002 # 0 2123
diff --git a/etc/charsets/CP949-2BYTE.map b/etc/charsets/CP949-2BYTE.map
index 5715c8b2a7af6cb085270ef7da0cc968ebc72f7a..246e56edc7b488ac04eccfb38666519b47baa549 100644
--- a/etc/charsets/CP949-2BYTE.map
+++ b/etc/charsets/CP949-2BYTE.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/CP949
+# Generated from CP949 in localedate/charmaps of glibc
 0x8141-0x8142 0xAC02
 0x8143-0x8144 0xAC05
 0x8145-0x8149 0xAC0B
diff --git a/etc/charsets/EBCDICUK.map b/etc/charsets/EBCDICUK.map
index a1785ca5fb4366ffe5e832f83fd4f1ed47d5916f..3b9a8923218887f7141197f9204c89f477b7106f 100644
--- a/etc/charsets/EBCDICUK.map
+++ b/etc/charsets/EBCDICUK.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/EBCDIC-UK
+# Generated from EBCDIC-UK in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/EBCDICUS.map b/etc/charsets/EBCDICUS.map
index ce57c9d07427eb21e91a24fafa809dad3f91bfda..a7a9a3b193956f996660d76b333e1c47f32f917e 100644
--- a/etc/charsets/EBCDICUS.map
+++ b/etc/charsets/EBCDICUS.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/EBCDIC-US
+# Generated from EBCDIC-US in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/GB180302.map b/etc/charsets/GB180302.map
index a4726047570471ce0e67d5dd0adb3fda8a77876e..a001f22153ff56cb1020dc91dd482105dbf5f18b 100644
--- a/etc/charsets/GB180302.map
+++ b/etc/charsets/GB180302.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/GB18030
+# Generated from GB18030 in localedate/charmaps of glibc
 0x8140 0x4E02
 0x8141-0x8143 0x4E04
 0x8144 0x4E0F
diff --git a/etc/charsets/GB180304.map b/etc/charsets/GB180304.map
index d4c653494e1871ec0eb0b3a59b21abcfb288e5d8..e81eacff6018f6cd69dec85b1c72a9ec01cbfacd 100644
--- a/etc/charsets/GB180304.map
+++ b/etc/charsets/GB180304.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/GB18030
+# Generated from GB18030 in localedate/charmaps of glibc
 0x81308130-0x81308435	0x0080
 0x81308436-0x81308437	0x00A5
 0x81308438-0x81308534	0x00A9
diff --git a/etc/charsets/GB2312.map b/etc/charsets/GB2312.map
index 85aa1d9231ffac5d09b394f1b792d138ee1d2177..3aa8649f693c99f52749edafb93f8b64381a281c 100644
--- a/etc/charsets/GB2312.map
+++ b/etc/charsets/GB2312.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/GB2312
+# Generated from GB2312 in localedate/charmaps of glibc
 0x2121-0x2123 0x3000
 0x2124 0x30FB
 0x2125 0x02C9
diff --git a/etc/charsets/GBK.map b/etc/charsets/GBK.map
index 76b3caa34b9aafcd58879182b4b3428c75d99ac1..16eabc49fddb6040d81496cee0c31c7fb4ad39be 100644
--- a/etc/charsets/GBK.map
+++ b/etc/charsets/GBK.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/GBK
+# Generated from GBK in localedate/charmaps of glibc
 0x8140 0x4E02
 0x8141-0x8143 0x4E04
 0x8144 0x4E0F
diff --git a/etc/charsets/HP-ROMAN8.map b/etc/charsets/HP-ROMAN8.map
index b57d9a1caba0ed5c72d670d6cc9a83007884eac2..2a6d2c668807ee32ede4b674749e572d7ac5534b 100644
--- a/etc/charsets/HP-ROMAN8.map
+++ b/etc/charsets/HP-ROMAN8.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/HP-ROMAN8
+# Generated from HP-ROMAN8 in localedate/charmaps of glibc
 0x00-0xA0 0x0000
 0xA1 0x00C0
 0xA2 0x00C2
diff --git a/etc/charsets/IBM037.map b/etc/charsets/IBM037.map
index 45d27cb8adf6177d17c8303d51b4c83912f91652..0b4f1c707480df01d19ca88bfcb60685d640a2b1 100644
--- a/etc/charsets/IBM037.map
+++ b/etc/charsets/IBM037.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM037
+# Generated from IBM037 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM038.map b/etc/charsets/IBM038.map
index e973b4e2ea886f28c40e5bef4927dc9b14c015b1..08d01a949976465ee4b961988cdd39a5084c5527 100644
--- a/etc/charsets/IBM038.map
+++ b/etc/charsets/IBM038.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM038
+# Generated from IBM038 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM1004.map b/etc/charsets/IBM1004.map
index bbe7248e2ba93b03088ae1f5803afea312a80701..d80f04e98a9b4a23a13cf35329a32beeb16fc53f 100644
--- a/etc/charsets/IBM1004.map
+++ b/etc/charsets/IBM1004.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM1004
+# Generated from IBM1004 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x82 0x201A
 0x84 0x201E
diff --git a/etc/charsets/IBM1026.map b/etc/charsets/IBM1026.map
index b4a0e0653a4e163f24232c0be9ecbdff96d4d56a..3ef61a59cce4d9819eabd1859338225b27f049e5 100644
--- a/etc/charsets/IBM1026.map
+++ b/etc/charsets/IBM1026.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM1026
+# Generated from IBM1026 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM1047.map b/etc/charsets/IBM1047.map
index 6d7ac0a1c4e2db11410d37e199ad86cdbb78bc09..d70ec70f0674876b597bbb0af381ccff950b4fbf 100644
--- a/etc/charsets/IBM1047.map
+++ b/etc/charsets/IBM1047.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM1047
+# Generated from IBM1047 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM256.map b/etc/charsets/IBM256.map
index 622e696cc8438040933713d4694b0b1ae1956b7f..a9940bf869000ea4069c72571e10cc428176f918 100644
--- a/etc/charsets/IBM256.map
+++ b/etc/charsets/IBM256.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM256
+# Generated from IBM256 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM273.map b/etc/charsets/IBM273.map
index 844e4a53c475d375e56faae77b3c2055b7c75648..3002375392e88ac7329d4df51758c40c7573a4fa 100644
--- a/etc/charsets/IBM273.map
+++ b/etc/charsets/IBM273.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM273
+# Generated from IBM273 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM274.map b/etc/charsets/IBM274.map
index 27c0fc10d542a3e6a76a05e468bd920b31f5f1db..9376b7d560eeb0c462cdd36866ef82ff86469973 100644
--- a/etc/charsets/IBM274.map
+++ b/etc/charsets/IBM274.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM274
+# Generated from IBM274 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM275.map b/etc/charsets/IBM275.map
index 0ba479b83fc190a109387da328442cd7fe4a2f6d..a55c11463ae0f36365943e4cdece565a3da719b9 100644
--- a/etc/charsets/IBM275.map
+++ b/etc/charsets/IBM275.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM275
+# Generated from IBM275 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM277.map b/etc/charsets/IBM277.map
index 49c4c79a0dd9a70b7cd50710c47fafa1c6895935..a0cf628080b4be2e8487c915f64d1c9d92824b55 100644
--- a/etc/charsets/IBM277.map
+++ b/etc/charsets/IBM277.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM277
+# Generated from IBM277 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM278.map b/etc/charsets/IBM278.map
index 5fd38a740169feb448c6feb9a009259e229e5aaa..dfa9994c76778de400276bd610b8bf26dc08ce5e 100644
--- a/etc/charsets/IBM278.map
+++ b/etc/charsets/IBM278.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM278
+# Generated from IBM278 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM280.map b/etc/charsets/IBM280.map
index e8e78347f47adff685fbd693c804fa54e7cbe957..d8c9ff668d5d86b942b65722798e86aed4d585b0 100644
--- a/etc/charsets/IBM280.map
+++ b/etc/charsets/IBM280.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM280
+# Generated from IBM280 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM281.map b/etc/charsets/IBM281.map
index e4dff95bc0aadf1c81447a3febafa922a71a0c3b..fda369661f88d90dbce8c802d9a65afb0ce3966b 100644
--- a/etc/charsets/IBM281.map
+++ b/etc/charsets/IBM281.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM281
+# Generated from IBM281 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM284.map b/etc/charsets/IBM284.map
index b415f40ff821886e339d32722177edb43d7cf67e..d3683014725ccab6f0efea0bf3021e621d246a7e 100644
--- a/etc/charsets/IBM284.map
+++ b/etc/charsets/IBM284.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM284
+# Generated from IBM284 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM285.map b/etc/charsets/IBM285.map
index 36c9fa3c089331700e93935c5bf7cc83f8470dfd..55d1072cb37b240c11faf28011c2568f75dc6d70 100644
--- a/etc/charsets/IBM285.map
+++ b/etc/charsets/IBM285.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM285
+# Generated from IBM285 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM290.map b/etc/charsets/IBM290.map
index eb38d2ea246bc887f1008ca1dcce3ad7169cdaf6..6ec069c02c1bd4ffcef9be9a9bb97452c94513b4 100644
--- a/etc/charsets/IBM290.map
+++ b/etc/charsets/IBM290.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM290
+# Generated from IBM290 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM297.map b/etc/charsets/IBM297.map
index dcd5b66dab48b3023b4a656b1f5d1363e951e6bd..45d007f241aca39894897f5e34a3e2c03c940ea0 100644
--- a/etc/charsets/IBM297.map
+++ b/etc/charsets/IBM297.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM297
+# Generated from IBM297 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM420.map b/etc/charsets/IBM420.map
index efc9a1038cfc9c013793cd4b7fe55bdc354509ed..b9325d9e972d9f6c5f061cfd5544ee063b637b60 100644
--- a/etc/charsets/IBM420.map
+++ b/etc/charsets/IBM420.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM420
+# Generated from IBM420 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM423.map b/etc/charsets/IBM423.map
index a6da4e5758e11f6bfca361e2556b28b37157d61a..381d2ffaa1c1b09f29620ace2c28399eb8ed9f7e 100644
--- a/etc/charsets/IBM423.map
+++ b/etc/charsets/IBM423.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM423
+# Generated from IBM423 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM424.map b/etc/charsets/IBM424.map
index 78d4b67a1ac162fb52c42740924eb850f367562a..d3bb908148bf43f4c291d0709b9e72c6f40a2627 100644
--- a/etc/charsets/IBM424.map
+++ b/etc/charsets/IBM424.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM424
+# Generated from IBM424 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM437.map b/etc/charsets/IBM437.map
index 058f981dabf53bde9f4d4859edbf089118991536..a840cb075172057538e31da15041508d728f29cd 100644
--- a/etc/charsets/IBM437.map
+++ b/etc/charsets/IBM437.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM437
+# Generated from IBM437 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x00C7
 0x81 0x00FC
diff --git a/etc/charsets/IBM500.map b/etc/charsets/IBM500.map
index 296a23ae7980b026aef917fec5a33935ab47d92c..e96c3615c89e52c4ccf1284867d6c47bcfe42cd1 100644
--- a/etc/charsets/IBM500.map
+++ b/etc/charsets/IBM500.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM500
+# Generated from IBM500 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM850.map b/etc/charsets/IBM850.map
index a12ab7aa3ba8cb697994a357e497ad30d96d69c0..d0884ba23050da0ee26df788c8fbbdf0c520ed61 100644
--- a/etc/charsets/IBM850.map
+++ b/etc/charsets/IBM850.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM850
+# Generated from IBM850 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x00C7
 0x81 0x00FC
diff --git a/etc/charsets/IBM851.map b/etc/charsets/IBM851.map
index be4e68aa5f5413d1fe2dfb57585df45037672b85..5c5d9b2e63093d3e2e308ad485e4f54ef26604de 100644
--- a/etc/charsets/IBM851.map
+++ b/etc/charsets/IBM851.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM851
+# Generated from IBM851 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x00C7
 0x81 0x00FC
diff --git a/etc/charsets/IBM852.map b/etc/charsets/IBM852.map
index 38192e167fc34eee346a7f092a178d6de7d1159c..ab6f9de0b106677fa0119176d0fd7734372a123e 100644
--- a/etc/charsets/IBM852.map
+++ b/etc/charsets/IBM852.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM852
+# Generated from IBM852 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x00C7
 0x81 0x00FC
diff --git a/etc/charsets/IBM855.map b/etc/charsets/IBM855.map
index 7018b57bd9a07c62fba70f7dce0cc2b1b37c00db..450d3cf7496274881b9bb44e7f9130b45b71b7ea 100644
--- a/etc/charsets/IBM855.map
+++ b/etc/charsets/IBM855.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM855
+# Generated from IBM855 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x0452
 0x81 0x0402
diff --git a/etc/charsets/IBM856.map b/etc/charsets/IBM856.map
index 61f6f27aa7014f7c5ca7682ed47d425c4e354384..8dc07a86e56097c110594a1a06c00e72b3efe341 100644
--- a/etc/charsets/IBM856.map
+++ b/etc/charsets/IBM856.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM856
+# Generated from IBM856 in localedate/charmaps of glibc
 0x00-0x19 0x0000
 0x1A 0x001C
 0x1B 0x001B
diff --git a/etc/charsets/IBM857.map b/etc/charsets/IBM857.map
index 9aca89ada7c4529b01b04fc7f236fae770ae4aef..da6524bd5aa4f1c9b3c23ce7cc53e08fcdc37a33 100644
--- a/etc/charsets/IBM857.map
+++ b/etc/charsets/IBM857.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM857
+# Generated from IBM857 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x00C7
 0x81 0x00FC
diff --git a/etc/charsets/IBM860.map b/etc/charsets/IBM860.map
index 9045d58a00ef8ffadbb6f4790d5ad024859f9091..ff758d7fda130ef8b4b92da86b1dd06a2a0b3fc8 100644
--- a/etc/charsets/IBM860.map
+++ b/etc/charsets/IBM860.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM860
+# Generated from IBM860 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x00C7
 0x81 0x00FC
diff --git a/etc/charsets/IBM861.map b/etc/charsets/IBM861.map
index 3c5f31a580b48a9ca42e3b8a924088d67a04ac80..20b82fdc7e5b95cdc1d501b011fc623e2252740c 100644
--- a/etc/charsets/IBM861.map
+++ b/etc/charsets/IBM861.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM861
+# Generated from IBM861 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x00C7
 0x81 0x00FC
diff --git a/etc/charsets/IBM862.map b/etc/charsets/IBM862.map
index 07183d3dbdfa56dfc9e24842bf91934519ca4b46..823ef993e6a2bfd994da1e9280d1f94ce4439afb 100644
--- a/etc/charsets/IBM862.map
+++ b/etc/charsets/IBM862.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM862
+# Generated from IBM862 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80-0x9A 0x05D0
 0x9B-0x9C 0x00A2
diff --git a/etc/charsets/IBM863.map b/etc/charsets/IBM863.map
index 5565e4288678dc990987e60eeb2483d746f9bdf2..711571beef7dea6563ba7813a56861f33527e85b 100644
--- a/etc/charsets/IBM863.map
+++ b/etc/charsets/IBM863.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM863
+# Generated from IBM863 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x00C7
 0x81 0x00FC
diff --git a/etc/charsets/IBM864.map b/etc/charsets/IBM864.map
index 2d627d81978af67f5ab589ba021a16742f53a581..673401bac64c6d9380313c8635fcba26fa27e072 100644
--- a/etc/charsets/IBM864.map
+++ b/etc/charsets/IBM864.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM864
+# Generated from IBM864 in localedate/charmaps of glibc
 0x00-0x24 0x0000
 0x25 0x066A
 0x26-0x7F 0x0026
diff --git a/etc/charsets/IBM865.map b/etc/charsets/IBM865.map
index 2dbd8683b80781d44b1d138b361fe5003c64bb20..be9e298cd8c0929e60308a5299191320389ecbce 100644
--- a/etc/charsets/IBM865.map
+++ b/etc/charsets/IBM865.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM865
+# Generated from IBM865 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x00C7
 0x81 0x00FC
diff --git a/etc/charsets/IBM866.map b/etc/charsets/IBM866.map
index 4c5b1c93587e57d5113ac21753faac15c093c9d3..83e51f0914cd6b2aca8c1282aecbddd07bdce2d7 100644
--- a/etc/charsets/IBM866.map
+++ b/etc/charsets/IBM866.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM866
+# Generated from IBM866 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80-0xAF 0x0410
 0xB0-0xB2 0x2591
diff --git a/etc/charsets/IBM868.map b/etc/charsets/IBM868.map
index 5ff01304b6adb4fe8bb398bcddc0565cc0f2259e..ae7d001a36c2cd21bc6e1a92653b760af9453984 100644
--- a/etc/charsets/IBM868.map
+++ b/etc/charsets/IBM868.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM868
+# Generated from IBM868 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80-0x89 0x0660
 0x8A 0x060C
diff --git a/etc/charsets/IBM869.map b/etc/charsets/IBM869.map
index e4e3a4d3127e0e58b9da9eca0165346a19292f19..f0bcf6fd2891244449e17e3afe916dfcdb8ca238 100644
--- a/etc/charsets/IBM869.map
+++ b/etc/charsets/IBM869.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM869
+# Generated from IBM869 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x86 0x0386
 0x88 0x00B7
diff --git a/etc/charsets/IBM870.map b/etc/charsets/IBM870.map
index fdd312dea3e5df099fe09704df40513d464e4c48..d4f1e7c3750ad8f793f37d8b93cf17d20a216ba5 100644
--- a/etc/charsets/IBM870.map
+++ b/etc/charsets/IBM870.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM870
+# Generated from IBM870 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM871.map b/etc/charsets/IBM871.map
index a80d0c2dfb6d818f8653998147b97dbe1ac5a7fd..5ae4eabad1a1edc6378d58a828ca61a8cff4f19a 100644
--- a/etc/charsets/IBM871.map
+++ b/etc/charsets/IBM871.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM871
+# Generated from IBM871 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM874.map b/etc/charsets/IBM874.map
index 1fad3f5726cf56d2d6d0ded0954bd102a5fcb558..122a698e201e8db5ef65f05895526fc98b673578 100644
--- a/etc/charsets/IBM874.map
+++ b/etc/charsets/IBM874.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM874
+# Generated from IBM874 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x20AC
 0x85 0x2026
diff --git a/etc/charsets/IBM875.map b/etc/charsets/IBM875.map
index c05a7a06c78f7644649c5c55e35e3da762fe76df..fd7a76bc726f258d41dd25a65ea627a41bbf379b 100644
--- a/etc/charsets/IBM875.map
+++ b/etc/charsets/IBM875.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM875
+# Generated from IBM875 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM880.map b/etc/charsets/IBM880.map
index a0dcc7e0f556d3b9466c8356d2ef0cf68edb1416..feaafe64d450fe6f1b1cb794f2b307097f37f2f2 100644
--- a/etc/charsets/IBM880.map
+++ b/etc/charsets/IBM880.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM880
+# Generated from IBM880 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM891.map b/etc/charsets/IBM891.map
index db1f1a81837138799bcf4ba002a44eaf4a22e9b9..c9321026e0ec39ce9affca1dce29f590a2ece700 100644
--- a/etc/charsets/IBM891.map
+++ b/etc/charsets/IBM891.map
@@ -1,2 +1,2 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM891
+# Generated from IBM891 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
diff --git a/etc/charsets/IBM903.map b/etc/charsets/IBM903.map
index 6e37f456ec17b8a165cfb1b6162c7cffd308111b..0569c01b0f55fe41a66e0d5eba04eafbaaa967df 100644
--- a/etc/charsets/IBM903.map
+++ b/etc/charsets/IBM903.map
@@ -1,2 +1,2 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM903
+# Generated from IBM903 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
diff --git a/etc/charsets/IBM904.map b/etc/charsets/IBM904.map
index 2a93751ee643d3a47bd2619b01d2869b29c93f9e..e2c8269058c1b0442a3ad1f8c014a6b1c846f5b1 100644
--- a/etc/charsets/IBM904.map
+++ b/etc/charsets/IBM904.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM904
+# Generated from IBM904 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x00A2
 0xFD 0x00AC
diff --git a/etc/charsets/IBM905.map b/etc/charsets/IBM905.map
index 9c6cc06618f99935f2111f99e900cda859a5fb15..96a6d716e54efc898d651f9b8c75c52f3a22653c 100644
--- a/etc/charsets/IBM905.map
+++ b/etc/charsets/IBM905.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM905
+# Generated from IBM905 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/IBM918.map b/etc/charsets/IBM918.map
index 326e2dce2997ebe921d925966fd1f01c11cde8a6..7e1afc034870c143f4a67b85aa5adbb1a37e6a2b 100644
--- a/etc/charsets/IBM918.map
+++ b/etc/charsets/IBM918.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/IBM918
+# Generated from IBM918 in localedate/charmaps of glibc
 0x00-0x03 0x0000
 0x04 0x009C
 0x05 0x0009
diff --git a/etc/charsets/JISC6226.map b/etc/charsets/JISC6226.map
index 765e06cf15565ec32b166a304935d3715a1a46ad..97d24651628e4aae6dbee0a82169c471118efc67 100644
--- a/etc/charsets/JISC6226.map
+++ b/etc/charsets/JISC6226.map
@@ -1,4 +1,5 @@
-# Generated from http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/.../Uni2JIS
+# Generated from admin/charsets/mapfiles/Uni2JIS.gz which is a copy of
+# http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/CJKtable/Uni2JIS.Z
 0x2121 0x3000
 0x2122 0x3001
 0x2123 0x3002
diff --git a/etc/charsets/JISX0201.map b/etc/charsets/JISX0201.map
index 5a644964bc2f2ab93c82b24ee347cd1a589a021b..d367d0d1e9c83d1abba91209f1835723f6ffcfc9 100644
--- a/etc/charsets/JISX0201.map
+++ b/etc/charsets/JISX0201.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/JIS_X0201
+# Generated from JIS_X0201 in localedate/charmaps of glibc
 0x00-0x5B 0x0000
 0x5C 0x00A5
 0x5D-0x7D 0x005D
diff --git a/etc/charsets/JISX0208.map b/etc/charsets/JISX0208.map
index 8722ffa3bda93be2a73989d0e30f511ae7a87183..eaaa919b8a4edb6985be464703e8752b4e2ea7c3 100644
--- a/etc/charsets/JISX0208.map
+++ b/etc/charsets/JISX0208.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3/localedata/charmaps/EUC-JP
+# Generated from EUC-JP in localedate/charmaps of glibc
 0x2121 0x3000
 0x2122 0x3001
 0x2123 0x3002
diff --git a/etc/charsets/JISX0212.map b/etc/charsets/JISX0212.map
index 39b47a94bc11fc8a17a05530750281f76129d3bf..b49e56fe249f0b9bb6cbb04ce53df59d5194d84c 100644
--- a/etc/charsets/JISX0212.map
+++ b/etc/charsets/JISX0212.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/EUC-JP
+# Generated from EUC-JP in localedate/charmaps of glibc
 0x222F 0x02D8
 0x2230 0x02C7
 0x2231 0x00B8
diff --git a/etc/charsets/JISX2131.map b/etc/charsets/JISX2131.map
index ef1d7e06de58632e5e72d8529f52f66f35757855..5d62e99650b86a61a3eff95d9beb24aa7b413da3 100644
--- a/etc/charsets/JISX2131.map
+++ b/etc/charsets/JISX2131.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/EUC-JISX0213
+# Generated from EUC-JISX0213 in localedate/charmaps of glibc
 0x2121 0x3000
 0x2122 0x3001
 0x2123 0x3002
@@ -1157,6 +1157,7 @@
 0x2d79 0x22BF
 0x2d7d 0x2756
 0x2d7e 0x261E
+0x2e21 0x4FF1
 0x2e22 0x0002000B
 0x2e23 0x3402
 0x2e24 0x4E28
@@ -1343,6 +1344,7 @@
 0x2f7b 0x000218BD
 0x2f7c 0x5B19
 0x2f7d 0x5B25
+0x2f7e 0x525D
 0x3021 0x4E9C
 0x3022 0x5516
 0x3023 0x5A03
@@ -4308,6 +4310,7 @@
 0x4f51 0x6E7E
 0x4f52 0x7897
 0x4f53 0x8155
+0x4f54 0x00020B9F
 0x4f55 0x5B41
 0x4f56 0x5B56
 0x4f57 0x5B7D
@@ -4349,6 +4352,7 @@
 0x4f7b 0x5DA7
 0x4f7c 0x5DB8
 0x4f7d 0x5DCB
+0x4f7e 0x541E
 0x5021 0x5F0C
 0x5022 0x4E10
 0x5023 0x4E15
@@ -7739,6 +7743,7 @@
 0x7424 0x7464
 0x7425 0x51DC
 0x7426 0x7199
+0x7427 0x5653
 0x7428 0x5DE2
 0x7429 0x5E14
 0x742a 0x5E18
@@ -8761,3 +8766,8 @@
 0x7e77 0x9F94
 0x7e78 0x9F97
 0x7e79 0x9FA2
+0x7e7a 0x59F8
+0x7e7b 0x5C5B
+0x7e7c 0x5E77
+0x7e7d 0x7626
+0x7e7e 0x7E6B
diff --git a/etc/charsets/JISX2132.map b/etc/charsets/JISX2132.map
index 3dbf783900eccf259832ae4d69dbaed0a0cefdd6..cc2e8677852113914bf30698165d210492bb81c3 100644
--- a/etc/charsets/JISX2132.map
+++ b/etc/charsets/JISX2132.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/EUC-JISX0213
+# Generated from EUC-JISX0213 in localedate/charmaps of glibc
 0x2121 0x00020089
 0x2122 0x4E02
 0x2123 0x4E0F
diff --git a/etc/charsets/JISX213A.map b/etc/charsets/JISX213A.map
index 95facca2ef02f6adc5ecccb5f69032e89f905c5f..05d61718a17efe7f57bff7dbc9c5cd77fc5aca36 100644
--- a/etc/charsets/JISX213A.map
+++ b/etc/charsets/JISX213A.map
@@ -1,3 +1,5 @@
+# Created manually based on the description of the section 33
+# in "JIS X 0213:2004 Amendment 1".
 0x2E21 0x4FF1
 0x2F7E 0x525D
 0x4F54 0x20B9F
diff --git a/etc/charsets/JOHAB.map b/etc/charsets/JOHAB.map
index cd13cc89d4e354204d1290f3be282072ae91e994..c61cde97150ad1fb316a1afe8a3d98d4e229da7b 100644
--- a/etc/charsets/JOHAB.map
+++ b/etc/charsets/JOHAB.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/JOHAB
+# Generated from JOHAB in localedate/charmaps of glibc
 0x8444 0x3133
 0x8446-0x8447 0x3135
 0x844A-0x8450 0x313A
@@ -974,6 +974,9 @@
 0xD9E3 0x33C2
 0xD9E4 0x33D8
 0xD9E5 0x2121
+0xD9E6 0x20AC
+0xD9E7 0x00AE
+0xD9E8 0x327E
 0xDA31-0xDA6B 0xFF01
 0xDA6C 0xFFE6
 0xDA6D-0xDA7E 0xFF3D
diff --git a/etc/charsets/KA-ACADEMY.map b/etc/charsets/KA-ACADEMY.map
index dab42678d70ac440a462dd3085eb2c98fca6da83..e14ff346acae207bef4e4afc70d7fb903d90666c 100644
--- a/etc/charsets/KA-ACADEMY.map
+++ b/etc/charsets/KA-ACADEMY.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/GEORGIAN-ACADEMY
+# Generated from GEORGIAN-ACADEMY in localedate/charmaps of glibc
 0x00-0x81 0x0000
 0x82 0x201A
 0x83 0x0192
diff --git a/etc/charsets/KA-PS.map b/etc/charsets/KA-PS.map
index ebf572cbe8fdf4ddfe9deeff11f092d132d47ef3..e36e0f3e54bcfc96db0e7811621b01b7ad234cf6 100644
--- a/etc/charsets/KA-PS.map
+++ b/etc/charsets/KA-PS.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/GEORGIAN-PS
+# Generated from GEORGIAN-PS in localedate/charmaps of glibc
 0x00-0x81 0x0000
 0x82 0x201A
 0x83 0x0192
diff --git a/etc/charsets/KOI-8.map b/etc/charsets/KOI-8.map
index 9ca58590175a1f8f98fb7cf2582bd1422a4ab532..8c06df687a909febe42d50696826b5a085a96c57 100644
--- a/etc/charsets/KOI-8.map
+++ b/etc/charsets/KOI-8.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/KOI-8
+# Generated from KOI-8 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0xC0 0x044E
 0xC1-0xC2 0x0430
diff --git a/etc/charsets/KOI8-R.map b/etc/charsets/KOI8-R.map
index 4edb48b2acf3ecaaad46497abd159e37f26d6ba6..8851aa1230b231b0f9dc53861a23d50fe342cedd 100644
--- a/etc/charsets/KOI8-R.map
+++ b/etc/charsets/KOI8-R.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/KOI8-R
+# Generated from KOI8-R in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x2500
 0x81 0x2502
diff --git a/etc/charsets/KOI8-T.map b/etc/charsets/KOI8-T.map
index 2e929090e4e7e2e0a3f6da1e90b8eacf5dbfae23..a756e77ab557d04f01da7193b9bc63e789960afc 100644
--- a/etc/charsets/KOI8-T.map
+++ b/etc/charsets/KOI8-T.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/KOI8-T
+# Generated from KOI8-T in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x049B
 0x81 0x0493
diff --git a/etc/charsets/KOI8-U.map b/etc/charsets/KOI8-U.map
index cec41cee2b8b938754e440befafae45778e7e80a..b9c2f135153246938c3d1ac2e4a4e4356a60b9bb 100644
--- a/etc/charsets/KOI8-U.map
+++ b/etc/charsets/KOI8-U.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/KOI8-U
+# Generated from KOI8-U in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x2500
 0x81 0x2502
diff --git a/etc/charsets/KSC5601.map b/etc/charsets/KSC5601.map
index bc73942978e0af6501470c77fa5a94dc15973c75..796222239d014f393af959fe9ddf092e387975be 100644
--- a/etc/charsets/KSC5601.map
+++ b/etc/charsets/KSC5601.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/EUC-KR
+# Generated from EUC-KR in localedate/charmaps of glibc
 0x2121-0x2123 0x3000
 0x2124 0x00B7
 0x2125-0x2126 0x2025
@@ -134,6 +134,7 @@
 0x2265 0x2121
 0x2266 0x20AC
 0x2267 0x00AE
+0x2268 0x327E
 0x2321-0x235B 0xFF01
 0x235C 0xFFE6
 0x235D-0x237D 0xFF3D
diff --git a/etc/charsets/KSC5636.map b/etc/charsets/KSC5636.map
index 3b50db3b78c48f4233aaaf10c0b2ec3c2d3b47b6..ff4f2654a14ea47041254c52305e4d0b2f984f67 100644
--- a/etc/charsets/KSC5636.map
+++ b/etc/charsets/KSC5636.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/KSC5636
+# Generated from KSC5636 in localedate/charmaps of glibc
 0x00-0x5B 0x0000
 0x5C 0x20A9
 0x5D-0x7F 0x005D
diff --git a/etc/charsets/MACINTOSH.map b/etc/charsets/MACINTOSH.map
index adffce04bee3d0b47c426930d4ca838b8eb57ff9..7e1f9ba632e66f438f37fab64547bf03b5a15d06 100644
--- a/etc/charsets/MACINTOSH.map
+++ b/etc/charsets/MACINTOSH.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/MACINTOSH
+# Generated from MACINTOSH in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80-0x81 0x00C4
 0x82 0x00C7
diff --git a/etc/charsets/MIK.map b/etc/charsets/MIK.map
index 3ebd5b1abdeebabe739f2cfab858cbe1f7f4a342..5a1176f9f505042ce202482a01a4dadc617b8f80 100644
--- a/etc/charsets/MIK.map
+++ b/etc/charsets/MIK.map
@@ -1,4 +1,5 @@
-# Generated from http://czyborra.com/charsets/bulgarian-mik.txt.gz
+# Generated from admin/charsets/mapfiles/bulgarian-mik.txt.gz which is a copy of
+# http://czyborra.com/charsets/bulgarian-mik.txt.gz
 0x20-0x7E 0x0020
 0x80-0xBF 0x0410
 0xC0 0x2514
diff --git a/etc/charsets/MULE-ethiopic.map b/etc/charsets/MULE-ethiopic.map
index cd8f73b39053148894cdeddbe4776eca8a5b486c..d2720bd10ba389a6216c597ecf39e6d22842fa8f 100644
--- a/etc/charsets/MULE-ethiopic.map
+++ b/etc/charsets/MULE-ethiopic.map
@@ -1,3 +1,4 @@
+# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
 0x2121 0x1200
 0x2122 0x1201
 0x2123 0x1202
diff --git a/etc/charsets/MULE-ipa.map b/etc/charsets/MULE-ipa.map
index 09f54b587fe707fbf827c3d8edcb82109fad4a37..35e5d50ecec1e9e8d646d69f8a8528aedc015075 100644
--- a/etc/charsets/MULE-ipa.map
+++ b/etc/charsets/MULE-ipa.map
@@ -1,3 +1,4 @@
+# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
 0x20 0x0069
 0x21 0x026A
 0x22 0x0065
diff --git a/etc/charsets/MULE-is13194.map b/etc/charsets/MULE-is13194.map
index ef1a44059603a1317db57dc6e5c6dc55292bb670..1fa9b21dcf8cb28d5019a663d97b4f46edccf9c9 100644
--- a/etc/charsets/MULE-is13194.map
+++ b/etc/charsets/MULE-is13194.map
@@ -1,3 +1,4 @@
+# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x0901
 0x22 0x0902
 0x23 0x0903
diff --git a/etc/charsets/MULE-lviscii.map b/etc/charsets/MULE-lviscii.map
index de25642a363f58a6e009e1ad629899aec8623b97..3b6a38be6169eec5f54ff36fe543a34716131872 100644
--- a/etc/charsets/MULE-lviscii.map
+++ b/etc/charsets/MULE-lviscii.map
@@ -1,3 +1,4 @@
+# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x1EAF
 0x22 0x1EB1
 0x23 0x1EB7
diff --git a/etc/charsets/MULE-sisheng.map b/etc/charsets/MULE-sisheng.map
index 9f0adb1cd8148bbdb3f4fc588852c560d92c984c..405bb1ffa2c127f9c257a1689fad88973b5f523f 100644
--- a/etc/charsets/MULE-sisheng.map
+++ b/etc/charsets/MULE-sisheng.map
@@ -1,3 +1,4 @@
+# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x0101
 0x22 0x00E1
 0x23 0x01CE
diff --git a/etc/charsets/MULE-tibetan.map b/etc/charsets/MULE-tibetan.map
index 9729dd91162e5f0dfd29e64bfbfc52005364ded5..0d6ff3a0a39f55fa14632d27f2dae2fd2019bc7a 100644
--- a/etc/charsets/MULE-tibetan.map
+++ b/etc/charsets/MULE-tibetan.map
@@ -1,3 +1,4 @@
+# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
 0x2130 0x0F00
 0x2131 0x0F01
 0x2132 0x0F02
diff --git a/etc/charsets/MULE-uviscii.map b/etc/charsets/MULE-uviscii.map
index 34646056c36441cc99fe1b0a3acbbe01f22a82a5..65e5d2968e576182e04ed1b62044828f3248cdd3 100644
--- a/etc/charsets/MULE-uviscii.map
+++ b/etc/charsets/MULE-uviscii.map
@@ -1,3 +1,4 @@
+# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x1EAE
 0x22 0x1EB0
 0x23 0x1EB6
diff --git a/etc/charsets/NEXTSTEP.map b/etc/charsets/NEXTSTEP.map
index 01ec8ccecc50f2786c0a226120dabaac66d2eb94..874e63805fc222bfa235a069d49f65b62273c433 100644
--- a/etc/charsets/NEXTSTEP.map
+++ b/etc/charsets/NEXTSTEP.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/NEXTSTEP
+# Generated from NEXTSTEP in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0x80 0x00A0
 0x81-0x86 0x00C0
diff --git a/etc/charsets/PTCP154.map b/etc/charsets/PTCP154.map
index 46c14bf8b11c0d6cab0fbb7665487f452df7ad87..72c6b3484d41caa1ef2b3a2be4c919c33c89993d 100644
--- a/etc/charsets/PTCP154.map
+++ b/etc/charsets/PTCP154.map
@@ -1,4 +1,5 @@
-# Generated from http://www.iana.org/assignments/charset-reg/PTCP154
+# Generated from admin/charsets/mapfiles/PTCP154.gz which is a copy of
+# http://www.iana.org/assignments/charset-reg/PTCP154
 0x00-0x7F 0x0000
 0x80 0x0496
 0x81 0x0492
diff --git a/etc/charsets/TIS-620.map b/etc/charsets/TIS-620.map
index 15afc4dfe9060aa221faa87d3aec5ca64f23ae48..f747974062f9442e09116d048b2900dc02fa80d2 100644
--- a/etc/charsets/TIS-620.map
+++ b/etc/charsets/TIS-620.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/TIS-620
+# Generated from TIS-620 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0xA1-0xDA 0x0E01
 0xDF-0xFB 0x0E3F
diff --git a/etc/charsets/VISCII.map b/etc/charsets/VISCII.map
index 4f5975c8a2efac90fb364dc312c1bf90b2cc3087..6b9f0d786e981f271db3cee49c92f098e8726b62 100644
--- a/etc/charsets/VISCII.map
+++ b/etc/charsets/VISCII.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/VISCII
+# Generated from VISCII in localedate/charmaps of glibc
 0x00-0x01 0x0000
 0x02 0x1EB2
 0x03-0x04 0x0003
diff --git a/etc/charsets/VSCII-2.map b/etc/charsets/VSCII-2.map
index 5e984d04515694fda8b37a5213a4fc3cc7a872b8..0f1fb5aeafece3ac7e9247a6e843ae8661661274 100644
--- a/etc/charsets/VSCII-2.map
+++ b/etc/charsets/VSCII-2.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/TCVN5712-1
+# Generated from TCVN5712-1 in localedate/charmaps of glibc
 0x00-0x7F 0x0000
 0xA0 0x00A0
 0xA1 0x0102
diff --git a/etc/charsets/VSCII.map b/etc/charsets/VSCII.map
index 7e9ec53922c593ed5c2bac30a600522f1d8d6d96..36d551b33adf8db3f3533647d806a635ae82bf69 100644
--- a/etc/charsets/VSCII.map
+++ b/etc/charsets/VSCII.map
@@ -1,4 +1,4 @@
-# Generated from glibc-2.3.2/localedata/charmaps/TCVN5712-1
+# Generated from TCVN5712-1 in localedate/charmaps of glibc
 0x00 0x0000
 0x01 0x00DA
 0x02 0x1EE4
diff --git a/etc/charsets/stdenc.map b/etc/charsets/stdenc.map
index c6def4ca757106b099031ef8764856ae0e834eea..af12881776436f76d4b61b9392c86a4c41bb5054 100644
--- a/etc/charsets/stdenc.map
+++ b/etc/charsets/stdenc.map
@@ -1,4 +1,5 @@
-# Generated from http://www.unicode.org/Public/MAPPINGS/.../stdenc.txt
+# Generated from admin/charsets/mapfiles/stdenc.txt.gz which is a copy of
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/stdenc.txt
 0x20 0x0020
 0x20 0x00A0
 0x21-0x26 0x0021
diff --git a/etc/charsets/symbol.map b/etc/charsets/symbol.map
index 3ea1f1d415949b8fb562b409fd6c55049fbfbd1d..e61f6f7781da67598802c9142abc4addce760b08 100644
--- a/etc/charsets/symbol.map
+++ b/etc/charsets/symbol.map
@@ -1,4 +1,5 @@
-# Generated from http://www.unicode.org/Public/MAPPINGS/.../symbol.txt
+# Generated from admin/charsets/mapfiles/symbol.txt.gz which is a copy of
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/symbol.txt
 0x20 0x0020
 0x20 0x00A0
 0x21 0x0021