diff --git a/ChangeLog b/ChangeLog
index a93e3d37df..5bb46f861b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 13 19:07:52 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (token_info_pop): show source filename. [ruby-dev:36710]
+
 Mon Oct 13 08:59:08 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (load_conv_function51932): support
diff --git a/parse.y b/parse.y
index f60d248c26..4adf43e871 100644
--- a/parse.y
+++ b/parse.y
@@ -4856,8 +4856,9 @@ token_info_pop(struct parser_params *parser, const char *token)
     if (token_info_has_nonspaces(parser, token) || ptinfo->nonspc) { /* SKIP */
 	goto finish;
     }
-    rb_warning("mismatched indentations: line %d:'%s' and line %d:'%s'",
-	       ptinfo->linenum, ptinfo->token, linenum, token);
+    rb_compile_warning(ruby_sourcefile, linenum,
+               "mismatched indentations at '%s' with '%s' at %d",
+	       token, ptinfo->token, ptinfo->linenum);
 
   finish:
     xfree(ptinfo);