diff --git a/ChangeLog b/ChangeLog
index 51473c5720..80d0059aa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct 11 19:49:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_prepare): use utf-8 encoding directly.
+
 Sat Oct 11 10:20:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (CLEANINGS): uses escaped form tabs to preventing the
diff --git a/parse.y b/parse.y
index 9dad7cd79f..f60d248c26 100644
--- a/parse.y
+++ b/parse.y
@@ -6295,7 +6295,7 @@ parser_prepare(struct parser_params *parser)
 	if (lex_pend - lex_p >= 2 &&
 	    (unsigned char)lex_p[0] == 0xbb &&
 	    (unsigned char)lex_p[1] == 0xbf) {
-	    parser_set_encode(parser, "UTF-8");
+	    parser->enc = rb_utf8_encoding();
 	    lex_p += 2;
 	    lex_pbeg = lex_p;
 	    return;