diff --git a/ChangeLog b/ChangeLog
index 1ce1528a72..86b022f082 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 26 03:38:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_each_char, rb_str_each_codepoint): string
+	  length must be long.
+
 Mon May 25 13:27:32 2009  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
 
 	* lib/mkmf.rb: dont use gsub! method for frozen string.
diff --git a/string.c b/string.c
index 573c5cafc7..ee790f8f61 100644
--- a/string.c
+++ b/string.c
@@ -5933,7 +5933,7 @@ static VALUE
 rb_str_each_char(VALUE str)
 {
     VALUE orig = str;
-    int i, len, n;
+    long i, len, n;
     const char *ptr;
     rb_encoding *enc;
 
@@ -5993,7 +5993,8 @@ static VALUE
 rb_str_each_codepoint(VALUE str)
 {
     VALUE orig = str;
-    int len, n;
+    long len;
+    int n;
     unsigned int c;
     const char *ptr, *end;
     rb_encoding *enc;
diff --git a/version.h b/version.h
index 040ce18f85..9a38cd19ac 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-05-25"
+#define RUBY_RELEASE_DATE "2009-05-26"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_DAY 26
 
 #include "ruby/version.h"