diff --git a/ChangeLog b/ChangeLog
index eeca881eb8..fad987e010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul  1 19:02:12 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* parse.y (rb_intern): should use mbclen instead of mblen.
+
 Tue Jul  1 10:36:19 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* class.c (rb_define_class, rb_define_module): also set constant under
diff --git a/parse.y b/parse.y
index e87bcfec59..24382950b9 100644
--- a/parse.y
+++ b/parse.y
@@ -5879,8 +5879,8 @@ rb_intern(name)
 	}
 	break;
     }
-    while (*m && is_identchar(*m)) {
-	m += mblen(m, name + last - m + 1);
+    while (m <= name + last && is_identchar(*m)) {
+	m += mbclen(*m);
     }
     if (*m) id = ID_JUNK;
     id |= ++last_id << ID_SCOPE_SHIFT;