diff --git a/ChangeLog b/ChangeLog
index 784f88e033..da9bf7fa53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 20 15:08:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_prepare): set begging after BOM if exists.
+	  [ruby-core:13718]
+
 Tue Nov 20 14:55:37 2007  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rubygems*: Update to RubyGems 0.9.5.
diff --git a/parse.y b/parse.y
index ea68d1f999..696ff6312d 100644
--- a/parse.y
+++ b/parse.y
@@ -5944,6 +5944,7 @@ parser_prepare(struct parser_params *parser)
 	    (unsigned char)lex_p[1] == 0xbf) {
 	    parser_set_encode(parser, "UTF-8");
 	    lex_p += 2;
+	    lex_pbeg = lex_p;
 	    return;
 	}
 	break;