diff --git a/ChangeLog b/ChangeLog
index 714e5040cb..fc42a29ffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-11-26  Ulrich Drepper  <drepper@cygnus.com>
 
+	* locale/programs/ld-ctype.c (allocate_arrays): Complete last
+	patch.  Use wch instead of idx to compute index.
+	Patch by Shinya Hanataka <hanataka@abyss.rim.or.jp>.
+
 	* inet/rcmd.c (ruserok): Use iruserok2 not iruserok.
 
 	* locale/iso-3166.def: Update from latest official list.
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index c82a36b80c..6273663933 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -3108,10 +3108,10 @@ Computing table size for character classes might take a while..."),
 	      if (wch != ILLEGAL_CHAR_VALUE)
 		{
 		  /* Store the value.  */
-		  size_t nr = idx % ctype->plane_size;
+		  size_t nr = wch % ctype->plane_size;
 		  size_t depth = 0;
 
-		  while (ctype->names[nr + depth * ctype->plane_size] != nr)
+		  while (ctype->names[nr + depth * ctype->plane_size] != wch)
 		    ++depth;
 		  assert (depth < ctype->plane_cnt);