diff --git a/ChangeLog b/ChangeLog
index a348c9a6d5..49892b61f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 17 03:06:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/utf8.c (utf8_code_to_mbclen): 0xfe and 0xff are valid Unicode to
+	  be encoded to 2bytes in UTF-8.  [ruby-core:12700]
+
 Wed Oct 17 02:50:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_ord): use encoding.
diff --git a/enc/utf8.c b/enc/utf8.c
index 3add59f475..a2acd5eee6 100644
--- a/enc/utf8.c
+++ b/enc/utf8.c
@@ -121,11 +121,7 @@ static int
 utf8_code_to_mbclen(OnigCodePoint code, OnigEncoding enc)
 {
   if      ((code & 0xffffff80) == 0) return 1;
-  else if ((code & 0xfffff800) == 0) {
-    if (code <= 0xff && code >= 0xfe)
-      return 1;
-    return 2;
-  }
+  else if ((code & 0xfffff800) == 0) return 2;
   else if ((code & 0xffff0000) == 0) return 3;
   else if ((code & 0xffe00000) == 0) return 4;
   else if ((code & 0xfc000000) == 0) return 5;