diff --git a/ChangeLog b/ChangeLog
index 5056e3d572..918f1c0fcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec  9 12:03:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_magic_comment): delimits with a semicolon.
+
 Sun Dec  9 11:29:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (tr_trans): get rid of segfaults when has mulitbytes but
diff --git a/parse.y b/parse.y
index 0a44cbe1db..2cf0ecde31 100644
--- a/parse.y
+++ b/parse.y
@@ -5860,7 +5860,7 @@ parser_magic_comment(struct parser_params *parser, const char *str, int len)
 	    }
 	}
 	else {
-	    for (vbeg = str; len > 0 && *str != '"' && !ISSPACE(*str); --len, str++);
+	    for (vbeg = str; len > 0 && *str != '"' && *str != ';' && !ISSPACE(*str); --len, str++);
 	    vend = str;
 	}
 	while (len > 0 && (*str == ';' || ISSPACE(*str))) --len, str++;