diff --git a/ChangeLog b/ChangeLog
index 09f4bf542f..9561883a14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 30 00:17:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): return non-valid token for an invalid
+	  instance/class variable name.  a patch from from Yusuke ENDOH
+	  <mame AT tsg.ne.jp>.  [ruby-dev:31095]
+
 Fri Jun 29 23:38:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (stmts): fix for ripper.
diff --git a/parse.y b/parse.y
index b53166812e..88cb61bdec 100644
--- a/parse.y
+++ b/parse.y
@@ -6705,6 +6705,7 @@ parser_yylex(struct parser_params *parser)
 	    else {
 		rb_compile_error(PARSER_ARG  "`@@%c' is not allowed as a class variable name", c);
 	    }
+	    return 0;
 	}
         uc = (unsigned char)c;
 	if (!is_identchar(uc)) {
diff --git a/version.h b/version.h
index ae13fd5fad..a36134b7e2 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-06-29"
+#define RUBY_RELEASE_DATE "2007-06-30"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070629
+#define RUBY_RELEASE_CODE 20070630
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_DAY 30
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];