diff --git a/ChangeLog b/ChangeLog
index 8297c9a16f..6c27b43210 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Jun  1 22:29:35 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* rational.c (string_to_r_internal): use rb_isdigit.
+
+	* marshal.c (long_toobig): use %zd.
+
+	* ruby.c (set_arg0): move unused variable definition.
+
 Sun Jun  1 12:18:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* insns.def (DEFINE_INSN): subtract of pointers is ptrdiff_t.
diff --git a/marshal.c b/marshal.c
index f78464d16e..fda961fdf2 100644
--- a/marshal.c
+++ b/marshal.c
@@ -937,7 +937,7 @@ r_byte(struct load_arg *arg)
 static void
 long_toobig(int size)
 {
-    rb_raise(rb_eTypeError, "long too big for this architecture (size %d, given %d)",
+    rb_raise(rb_eTypeError, "long too big for this architecture (size %zd, given %d)",
 	     sizeof(long), size);
 }
 
diff --git a/rational.c b/rational.c
index f54cb70e24..13487363fb 100644
--- a/rational.c
+++ b/rational.c
@@ -1371,7 +1371,7 @@ string_to_r_internal(VALUE self)
 	    VALUE l;
 
 	    while (*p) {
-		if (isdigit(*p))
+		if (rb_isdigit(*p))
 		    count++;
 		p++;
 	    }
diff --git a/ruby.c b/ruby.c
index 97a9ab6e69..2fc8366c4e 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1357,7 +1357,7 @@ get_arglen(int argc, char **argv)
 static void
 set_arg0(VALUE val, ID id)
 {
-    char *s, *t;
+    char *s;
     long i;
 
     if (origarg.argv == 0)
@@ -1388,13 +1388,12 @@ set_arg0(VALUE val, ID id)
     }
 
     memcpy(origarg.argv[0], s, i);
-    t = origarg.argv[0] + i;
-    *t = '\0';
-
-    if (i + 1 < origarg.len) memset(t + 1, ' ', origarg.len - i - 1);
 
     {
-	int j;
+	char *t = origarg.argv[0] + i;
+	*t = '\0';
+
+	if (i + 1 < origarg.len) memset(t + 1, ' ', origarg.len - i - 1);
 	for (j = 1; j < origarg.argc; j++) {
 	    origarg.argv[j] = t;
 	}
diff --git a/version.h b/version.h
index 69a00ae27f..2521e9c530 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-06-01"
+#define RUBY_RELEASE_DATE "2008-06-02"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080601
+#define RUBY_RELEASE_CODE 20080602
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 2
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];