diff --git a/ChangeLog b/ChangeLog
index c3b2821cbe..1565f06a84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 22 19:10:44 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread_win32.c (Init_native_thread): need to call
+	  ruby_thread_set_native() here.
+
 Mon Dec 22 18:00:36 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tcltklib.c: fix wrong flag value.
diff --git a/thread_win32.c b/thread_win32.c
index 0befbff4ae..684085fdb0 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -50,6 +50,7 @@ Init_native_thread(void)
     rb_thread_t *th = GET_THREAD();
 
     ruby_native_thread_key = TlsAlloc();
+    ruby_thread_set_native(th);
     DuplicateHandle(GetCurrentProcess(),
 		    GetCurrentThread(),
 		    GetCurrentProcess(),