diff --git a/ChangeLog b/ChangeLog
index 4c02f51b88..ab8a9a6310 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-20  Ulrich Drepper  <drepper@redhat.com>
+
+	* iconvdata/ibm1364.h (__ucs4_to_ibm1364sb): Fix one mapping.
+	* iconvdata/ibm1388.h (__ucs4_to_ibm1388sb): Likewise.
+	* iconvdata/testdata/IBM1364: Add missing valid input.
+	* iconvdata/testdata/IBM1388: Likewise.
+	* iconvdata/testdata/IBM1364..UTF8: Adjust appropriately.
+	* iconvdata/testdata/IBM1388..UTF8: Likewise.
+	Patch by Masahide Washizawa <washi@jp.ibm.com>.
+
 2005-08-23  GOTO Masanori  <gotom@debian.or.jp>
 
 	* sysdeps/alpha/remqu.S: Return the correct result when the same
diff --git a/iconvdata/ibm1364.h b/iconvdata/ibm1364.h
index f3bcdf706c..a2cdb8c639 100644
--- a/iconvdata/ibm1364.h
+++ b/iconvdata/ibm1364.h
@@ -8014,7 +8014,7 @@ static const char __ucs4_to_ibm1364sb[][1] =
   "\x7c", "\xc1", "\xc2", "\xc3", "\xc4", "\xc5", "\xc6", "\xc7",
   "\xc8", "\xc9", "\xd1", "\xd2", "\xd3", "\xd4", "\xd5", "\xd6",
   "\xd7", "\xd8", "\xd9", "\xe2", "\xe3", "\xe4", "\xe5", "\xe6",
-  "\xe7", "\xe8", "\xe9", "\x70", "\x5b", "\x80", "\xb0", "\x6d",
+  "\xe7", "\xe8", "\xe9", "\x70", "\xb2", "\x80", "\xb0", "\x6d",
   "\x79", "\x81", "\x82", "\x83", "\x84", "\x85", "\x86", "\x87",
   "\x88", "\x89", "\x91", "\x92", "\x93", "\x94", "\x95", "\x96",
   "\x97", "\x98", "\x99", "\xa2", "\xa3", "\xa4", "\xa5", "\xa6",
diff --git a/iconvdata/ibm1388.h b/iconvdata/ibm1388.h
index 6b28400ece..206e4eee6a 100644
--- a/iconvdata/ibm1388.h
+++ b/iconvdata/ibm1388.h
@@ -11316,11 +11316,11 @@ static const char __ucs4_to_ibm1388sb[][1] =
   "\x7c", "\xc1", "\xc2", "\xc3", "\xc4", "\xc5", "\xc6", "\xc7",
   "\xc8", "\xc9", "\xd1", "\xd2", "\xd3", "\xd4", "\xd5", "\xd6",
   "\xd7", "\xd8", "\xd9", "\xe2", "\xe3", "\xe4", "\xe5", "\xe6",
-  "\xe7", "\xe8", "\xe9", "\xba", "\x5b", "\xbb", "\xb0", "\x6d",
+  "\xe7", "\xe8", "\xe9", "\xba", "\xb2", "\xbb", "\xb0", "\x6d",
   "\x79", "\x81", "\x82", "\x83", "\x84", "\x85", "\x86", "\x87",
   "\x88", "\x89", "\x91", "\x92", "\x93", "\x94", "\x95", "\x96",
   "\x97", "\x98", "\x99", "\xa2", "\xa3", "\xa4", "\xa5", "\xa6",
-  "\xa7", "\xa8", "\xa9", "\xc0", "\x4f", "\xd0", "\xa1", "\x07",
+  "\xa7", "\xa8", "\xa9", "\xc0", "\x4f", "\xd0", "\xa0", "\x07",
   "\x20", "\x21", "\x22", "\x23", "\x24", "\x15", "\x06", "\x17",
   "\x28", "\x29", "\x2a", "\x2b", "\x2c", "\x09", "\x0a", "\x1b",
   "\x30", "\x31", "\x1a", "\x33", "\x34", "\x35", "\x36", "\x08",
diff --git a/iconvdata/testdata/IBM1364 b/iconvdata/testdata/IBM1364
index e9a93d126b..ad1feec0ef 100644
Binary files a/iconvdata/testdata/IBM1364 and b/iconvdata/testdata/IBM1364 differ
diff --git a/iconvdata/testdata/IBM1364..UTF8 b/iconvdata/testdata/IBM1364..UTF8
index 92ee11c555..1d748a01a6 100644
Binary files a/iconvdata/testdata/IBM1364..UTF8 and b/iconvdata/testdata/IBM1364..UTF8 differ
diff --git a/iconvdata/testdata/IBM1388 b/iconvdata/testdata/IBM1388
index 5340b79c65..618f2fb0c1 100644
Binary files a/iconvdata/testdata/IBM1388 and b/iconvdata/testdata/IBM1388 differ
diff --git a/iconvdata/testdata/IBM1388..UTF8 b/iconvdata/testdata/IBM1388..UTF8
index 3188740835..55b5fb97fb 100644
Binary files a/iconvdata/testdata/IBM1388..UTF8 and b/iconvdata/testdata/IBM1388..UTF8 differ