diff --git a/ChangeLog b/ChangeLog
index a172371605..0c893fdbbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 29 17:09:48 2008  wanabe  <s.wanabe@gmail.com>
+
+	* util.c (ruby_strtod): ruby_strtod don't allow a trailing
+	  decimal point like "7.". [ruby-dev:34835] [ruby-dev:35009]
+
 Sat Jun 28 19:23:40 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* class.c (clone_method): use rb_copy_node_scope.
diff --git a/util.c b/util.c
index 4d96ae33a6..de18895cb7 100644
--- a/util.c
+++ b/util.c
@@ -2171,6 +2171,8 @@ break2:
     }
 #endif
     if (c == '.') {
+        if (!ISDIGIT(s[1]))
+            goto dig_done;
         c = *++s;
         if (!nd) {
             for (; c == '0'; c = *++s)
diff --git a/version.h b/version.h
index 0375934d6d..c7865ef788 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-06-28"
+#define RUBY_RELEASE_DATE "2008-06-29"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080628
-#define RUBY_PATCHLEVEL 23
+#define RUBY_RELEASE_CODE 20080629
+#define RUBY_PATCHLEVEL 24
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 29
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];