diff --git a/ChangeLog b/ChangeLog
index 7e9d0ba090..a7f4ba4edd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2000-12-03  Ulrich Drepper  <drepper@redhat.com>
 
+	* iconvdata/SJIS.irreversible: Remove unnecessary entries.
+	* iconvdata/EUC-JP.irreversible: Remove unnecessary entries.
+
+	* iconvdata/sjis.c: Enable round-trip mapping of backslash and tilde.
+	* iconvdata/jis0208.c: Likewise.
+	* iconvdata/jis0212.c: Likewise.
+	Patch by Shinya Hanataka <hanataka@abyss.rim.or.jp>.
+
 	* math/test-misc.c (main): More tests for frexp and some for
 	fpclassify and isnormal.
 
diff --git a/iconvdata/EUC-JP.irreversible b/iconvdata/EUC-JP.irreversible
index e4c0ed5736..1921ac8f6d 100644
--- a/iconvdata/EUC-JP.irreversible
+++ b/iconvdata/EUC-JP.irreversible
@@ -1,6 +1,2 @@
 0x5C	0x00A5
 0x7E	0x203E
-0x8FA2B7	0x007E
-0x8FA2B7	0xFF5E
-0xA1C0	0x005C
-0xA1C0	0xFF3C
diff --git a/iconvdata/SJIS.irreversible b/iconvdata/SJIS.irreversible
index dfc678a1c6..c3c28e2538 100644
--- a/iconvdata/SJIS.irreversible
+++ b/iconvdata/SJIS.irreversible
@@ -1,7 +1,5 @@
 0x5C	0x005C
 0x7E	0x007E
-0x815F	0x005C
-0x815F	0xFF3C
 0x8191	0xFFE0
 0x8192	0xFFE1
 0x81CA	0xFFE2
diff --git a/iconvdata/jis0208.c b/iconvdata/jis0208.c
index bd92e1229b..06558f6983 100644
--- a/iconvdata/jis0208.c
+++ b/iconvdata/jis0208.c
@@ -67,7 +67,7 @@ const uint16_t __jis0208_to_ucs[0x1e80] =
   [0x0010] = 0xffe3, [0x0011] = 0xff3f, [0x0012] = 0x30fd, [0x0013] = 0x30fe,
   [0x0014] = 0x309d, [0x0015] = 0x309e, [0x0016] = 0x3003, [0x0017] = 0x4edd,
   [0x0018] = 0x3005, [0x0019] = 0x3006, [0x001a] = 0x3007, [0x001b] = 0x30fc,
-  [0x001c] = 0x2015, [0x001d] = 0x2010, [0x001e] = 0xff0f, [0x001f] = 0x005c,
+  [0x001c] = 0x2015, [0x001d] = 0x2010, [0x001e] = 0xff0f, [0x001f] = 0xff3c,
   [0x0020] = 0x301c, [0x0021] = 0x2016, [0x0022] = 0xff5c, [0x0023] = 0x2026,
   [0x0024] = 0x2025, [0x0025] = 0x2018, [0x0026] = 0x2019, [0x0027] = 0x201c,
   [0x0028] = 0x201d, [0x0029] = 0xff08, [0x002a] = 0xff09, [0x002b] = 0x3014,
diff --git a/iconvdata/jis0212.c b/iconvdata/jis0212.c
index b8baaa3652..36857b653e 100644
--- a/iconvdata/jis0212.c
+++ b/iconvdata/jis0212.c
@@ -111,7 +111,7 @@ const struct jisx0212_idx __jisx0212_to_ucs_idx[] =
 const uint16_t __jisx0212_to_ucs[] =
 {
   0x02d8, 0x02c7, 0x00b8, 0x02d9, 0x02dd, 0x00af, 0x02db, 0x02da,
-  0x007e, 0x0384, 0x0385, 0x00a1, 0x00a6, 0x00bf, 0x00ba, 0x00aa,
+  0xff5e, 0x0384, 0x0385, 0x00a1, 0x00a6, 0x00bf, 0x00ba, 0x00aa,
   0x00a9, 0x00ae, 0x2122, 0x00a4, 0x2116, 0x0386, 0x0388, 0x0389,
   0x038a, 0x03aa, 000000, 0x038c, 000000, 0x038e, 0x03ab, 000000,
   0x038f, 000000, 000000, 000000, 000000, 0x03ac, 0x03ad, 0x03ae,
diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c
index 33a20561ed..7bbfef3e5d 100644
--- a/iconvdata/sjis.c
+++ b/iconvdata/sjis.c
@@ -67,7 +67,7 @@ static const uint16_t cjk_block1[703] =
   [ 16] = 0xFFE3, [ 17] = 0xFF3F, [ 18] = 0x30FD, [ 19] = 0x30FE,
   [ 20] = 0x309D, [ 21] = 0x309E, [ 22] = 0x3003, [ 23] = 0x4EDD,
   [ 24] = 0x3005, [ 25] = 0x3006, [ 26] = 0x3007, [ 27] = 0x30FC,
-  [ 28] = 0x2015, [ 29] = 0x2010, [ 30] = 0xFF0F, [ 31] = 0x005C,
+  [ 28] = 0x2015, [ 29] = 0x2010, [ 30] = 0xFF0F, [ 31] = 0xFF3C,
   [ 32] = 0x301C, [ 33] = 0x2016, [ 34] = 0xFF5C, [ 35] = 0x2026,
   [ 36] = 0x2025, [ 37] = 0x2018, [ 38] = 0x2019, [ 39] = 0x201C,
   [ 40] = 0x201D, [ 41] = 0xFF08, [ 42] = 0xFF09, [ 43] = 0x3014,
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 238facdb2f..5a1af0cbbb 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-03  Ulrich Drepper  <drepper@redhat.com>
+
+	* charmaps/SJIS: Add mapping for FULLWIDTH REVERSE SOLIDUS.
+	* charmaps/EUC-JP: Add mapping for FULLWIDTH TILDE and FULLWIDTH
+	REVERSE SOLIDUS.
+
 2000-11-30  Ulrich Drepper  <drepper@redhat.com>
 
 	* Makefile (tests): Add tst-setlocale.
diff --git a/localedata/charmaps/EUC-JP b/localedata/charmaps/EUC-JP
index 9997d968aa..691d4f6bd4 100644
--- a/localedata/charmaps/EUC-JP
+++ b/localedata/charmaps/EUC-JP
@@ -276,7 +276,7 @@ CHARMAP
 <U2015>     /xa1/xbd     HORIZONTAL BAR
 <U2010>     /xa1/xbe     HYPHEN
 <UFF0F>     /xa1/xbf     FULLWIDTH SOLIDUS
-%IRREVERSIBLE%<U005C>     /xa1/xc0     REVERSE SOLIDUS
+<UFF3C>     /xa1/xc0     FULLWIDTH REVERSE SOLIDUS
 <U301C>     /xa1/xc1     WAVE DASH
 <U2016>     /xa1/xc2     DOUBLE VERTICAL LINE
 <UFF5C>     /xa1/xc3     FULLWIDTH VERTICAL LINE
@@ -7136,7 +7136,7 @@ CHARMAP
 <U00AF>     /x8f/xa2/xb4 MACRON
 <U02DB>     /x8f/xa2/xb5 OGONEK
 <U02DA>     /x8f/xa2/xb6 RING ABOVE
-%IRREVERSIBLE%<U007E>     /x8f/xa2/xb7 TILDE
+<UFF5E>     /x8f/xa2/xb7 FULLWIDTH TILDE
 <U0384>     /x8f/xa2/xb8 GREEK TONOS
 <U0385>     /x8f/xa2/xb9 GREEK DIALYTIKA TONOS
 <U00A1>     /x8f/xa2/xc2 INVERTED EXCLAMATION MARK
diff --git a/localedata/charmaps/SJIS b/localedata/charmaps/SJIS
index 49dd94e514..a887a0a25e 100644
--- a/localedata/charmaps/SJIS
+++ b/localedata/charmaps/SJIS
@@ -165,7 +165,7 @@ CHARMAP
 <U2015>     /x81/x5c     HORIZONTAL BAR
 <U2010>     /x81/x5d     HYPHEN
 <UFF0F>     /x81/x5e     FULLWIDTH SOLIDUS
-<U005C>     /x81/x5f     REVERSE SOLIDUS
+<UFF3C>     /x81/x5f     FULLWIDTH REVERSE SOLIDUS
 <U301C>     /x81/x60     WAVE DASH
 <U2016>     /x81/x61     DOUBLE VERTICAL LINE
 <UFF5C>     /x81/x62     FULLWIDTH VERTICAL LINE