diff --git a/ChangeLog b/ChangeLog
index cf7b75f346..239a8d23d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 16 09:19:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (magic_comment_encoding): use rb_compile_warning() to
+	  show the currently parsing file name.  [ruby-core:23469]
+
 Sat May 16 09:03:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (ruby_version): now version.h includes
diff --git a/parse.y b/parse.y
index e2e92ce74f..ec711add00 100644
--- a/parse.y
+++ b/parse.y
@@ -6100,8 +6100,8 @@ static void
 magic_comment_encoding(struct parser_params *parser, const char *name, const char *val)
 {
     if (!comment_at_top(parser)) {
-	rb_warning("encoding '%s' is ignored, valid only in the first line except for shebang line.",
-		   val);
+	rb_warningS("encoding '%s' is ignored, valid only in the first line except for shebang line.",
+		    val);
 	return;
     }
     parser_set_encode(parser, val);