3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f14f8dc65..cf872e2d81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 17 00:43:47 2010  Nobuyoshi Nakada  <[email protected]>
+
+	* version.c (ruby_description): RUBY_REVISION_STR may be empty.
+	  [ruby-core:30268]
+
 Sun May 16 10:49:47 2010  Nobuyoshi Nakada  <[email protected]>
 
 	* ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments.
diff --git a/version.c b/version.c
index 35bf153e7d..1f6553030c 100644
--- a/version.c
+++ b/version.c
@@ -41,14 +41,20 @@ const struct {
     char patchlevel[sizeof(RUBY_PATCHLEVEL_STR)-1];
     char pad1[2];
     char release_date[sizeof(RUBY_RELEASE_DATE)-1];
+#if RUBY_REVISION
     char revision[sizeof(RUBY_REVISION_STR)-1];
+#endif
     char pad2[3];
     char platform[sizeof(RUBY_PLATFORM)-1];
     char pad3[2];
 } ruby_description[1] UNALIGNED = {
     {
 	"ruby ", RUBY_VERSION, RUBY_PATCHLEVEL_STR,
-	" (", RUBY_RELEASE_DATE, RUBY_REVISION_STR, ") [",
+	" (", RUBY_RELEASE_DATE,
+#if RUBY_REVISION
+	RUBY_REVISION_STR,
+#endif
+	") [",
 	RUBY_PLATFORM, "]"
     }
 };
diff --git a/version.h b/version.h
index eae069c25f..af5d9406c7 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-05-16"
+#define RUBY_RELEASE_DATE "2010-05-17"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100516
+#define RUBY_RELEASE_CODE 20100517
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
 
 #define NO_STRING_LITERAL_CONCATENATION 1
 #ifdef RUBY_EXTERN