diff --git a/ChangeLog b/ChangeLog
index cc11f71569..e7ec941819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Sat Nov  8 01:42:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Nov  8 01:48:07 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): do not wait never
+	  coming signal if failed to create tiemr thread.
 
 	* thread_pthread.c (native_cond_timedwait): returns error code.
 
diff --git a/thread_pthread.c b/thread_pthread.c
index 46a86192e1..5fc335b304 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -719,11 +719,12 @@ rb_thread_create_timer_thread(void)
 #endif
 	native_mutex_lock(&timer_thread_lock);
 	err = pthread_create(&timer_thread_id, &attr, thread_timer, 0);
-	native_cond_wait(&timer_thread_cond, &timer_thread_lock);
-	native_mutex_unlock(&timer_thread_lock);
 	if (err != 0) {
+	    native_mutex_unlock(&timer_thread_lock);
 	    rb_bug("rb_thread_create_timer_thread: return non-zero (%d)", err);
 	}
+	native_cond_wait(&timer_thread_cond, &timer_thread_lock);
+	native_mutex_unlock(&timer_thread_lock);
     }
     rb_disable_interrupt(); /* only timer thread recieve signal */
 }