diff --git a/ChangeLog b/ChangeLog
index 9feb46f54a..70371ae8f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 10 10:53:03 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_sysopen): workaround for MSVCRT's bug.
+	  [ruby-core:24838]
+
 Mon Sep  7 19:52:44 2009  Tanaka Akira  <akr@fsij.org>
 
 	* eval.c (rb_thread_schedule): need select for WAIT_SELECT, even if
diff --git a/io.c b/io.c
index a5b0ef527a..a47bfc5170 100644
--- a/io.c
+++ b/io.c
@@ -2905,10 +2905,16 @@ rb_sysopen(fname, flags, mode)
 {
     int fd;
 
+#ifdef _WIN32
+    errno = EINVAL;
+#endif
     fd = open(fname, flags, mode);
     if (fd < 0) {
 	if (errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
+#ifdef _WIN32
+	    errno = EINVAL;
+#endif
 	    fd = open(fname, flags, mode);
 	}
 	if (fd < 0) {
diff --git a/version.h b/version.h
index c00e6dc970..399d66432a 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-09-07"
+#define RUBY_RELEASE_DATE "2009-09-10"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090907
-#define RUBY_PATCHLEVEL 200
+#define RUBY_RELEASE_CODE 20090910
+#define RUBY_PATCHLEVEL 201
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 10
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];