diff --git a/ChangeLog b/ChangeLog
index faceff3ec7..dff11fab41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun 21 17:13:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_intern2): name may not be NUL-terminated.
+
 Wed Jun 20 08:27:57 2007  Tanaka Akira  <akr@fsij.org>
 
 	* eval_error.h (error_print): show full stacktrace on
diff --git a/parse.y b/parse.y
index 56df203b8d..70c57ac796 100644
--- a/parse.y
+++ b/parse.y
@@ -8420,8 +8420,8 @@ rb_symname_p(const char *name)
 ID
 rb_intern2(const char *name, long len)
 {
-    const char *m = name;
     VALUE str = rb_str_new(name, len);
+    const char *m = RSTRING_PTR(str);
     ID id;
     int last;
 
diff --git a/version.h b/version.h
index 7bfb152234..08a05b8785 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-06-20"
+#define RUBY_RELEASE_DATE "2007-06-21"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070620
+#define RUBY_RELEASE_CODE 20070621
 #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 20
+#define RUBY_RELEASE_DAY 21
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];