diff --git a/ChangeLog b/ChangeLog
index 184995f267..3daf3309e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 13 18:20:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_magic_comment): fixed normalization.
+
 Tue Oct 13 09:04:14 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* thread.c: Revert changes to Thread#raise made in r25278
diff --git a/parse.y b/parse.y
index 07ee4bc08f..a044e71959 100644
--- a/parse.y
+++ b/parse.y
@@ -6251,7 +6251,7 @@ parser_magic_comment(struct parser_params *parser, const char *str, long len)
 	str_copy(name, beg, n);
 	s = RSTRING_PTR(name);
 	for (i = 0; i < n; ++i) {
-	    if (*s == '-') *s = '_';
+	    if (s[i] == '-') s[i] = '_';
 	}
 #ifndef RIPPER
 	do {