diff --git a/ChangeLog b/ChangeLog
index 61234e372e..504c867ae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 25 01:52:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_start_func_2): sets native thread key.
+
 Thu Dec 25 01:09:23 2008  TAKAO Kouji  <kouji@takao7.net>
 
 	* test/readline/test_readline_history.rb: check the encoding that
diff --git a/thread.c b/thread.c
index 749864aaed..536652e3ba 100644
--- a/thread.c
+++ b/thread.c
@@ -362,6 +362,8 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
     rb_thread_t *main_th;
     VALUE errinfo = Qnil;
 
+    ruby_thread_set_native(th);
+
     th->machine_stack_start = stack_start;
 #ifdef __ia64
     th->machine_register_stack_start = register_stack_start;