diff --git a/ChangeLog b/ChangeLog
index d79a470286..8f1cd3f626 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug  5 15:29:54 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_flush): fsync() after buffer is flushed on win32.
+	  backported from trunk.  [ruby-core:20043]
+
+
 Tue Aug  4 11:00:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* re.h (RMATCH_REGS): added for compatibility.
diff --git a/io.c b/io.c
index 3799c1b622..7151041dd9 100644
--- a/io.c
+++ b/io.c
@@ -650,6 +650,9 @@ rb_io_flush(io)
     f = GetWriteFile(fptr);
 
     io_fflush(f, fptr);
+#ifdef _WIN32
+    fsync(fileno(f));
+#endif
 
     return io;
 }
diff --git a/version.h b/version.h
index 98a7c35f2e..5d114efd41 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-08-04"
+#define RUBY_RELEASE_DATE "2009-08-05"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090804
-#define RUBY_PATCHLEVEL 194
+#define RUBY_RELEASE_CODE 20090805
+#define RUBY_PATCHLEVEL 195
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];