diff --git a/ChangeLog b/ChangeLog
index 71e83ffad4..cf5dda5199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 30 00:43:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_thread_run): change RDoc. The old example is buggy
+	  and may cause deadlock. The patch is suggested by Heesob Park
+	  <phasis@gmail.com>. Thank you! [Bug #3606][ruby-core:31454]
+
 Thu Jun 30 00:30:15 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
 
 	* lib/cmath.rb: make same exception for Math. fix [Bug #3137].
diff --git a/thread.c b/thread.c
index 678c16ff62..0f7bce4e1c 100644
--- a/thread.c
+++ b/thread.c
@@ -1629,7 +1629,7 @@ rb_thread_wakeup_alive(VALUE thread)
  *  Wakes up <i>thr</i>, making it eligible for scheduling.
  *
  *     a = Thread.new { puts "a"; Thread.stop; puts "c" }
- *     Thread.pass
+ *     sleep 0.1 while a.status!='sleep'
  *     puts "Got here"
  *     a.run
  *     a.join