diff --git a/ChangeLog b/ChangeLog
index 72f2be2685..489fce9cb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug  2 16:34:32 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (native_thread_join): need to wait thread, of course.
+	  [ruby-dev:41911]
+
 Mon Aug  2 12:22:22 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (file_expand_path): wrong condition. [ruby-core:31591]
diff --git a/thread_win32.c b/thread_win32.c
index 1391bece54..894fad92fc 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -507,7 +507,7 @@ native_thread_create(rb_thread_t *th)
 static void
 native_thread_join(HANDLE th)
 {
-    w32_wait_events(&th, 1, 0, 0);
+    w32_wait_events(&th, 1, INFINITE, 0);
 }
 
 #if USE_NATIVE_THREAD_PRIORITY