diff --git a/ChangeLog b/ChangeLog
index c0de652c41..30681d7776 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 24 10:23:24 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_signal.rb (TestSignal#test_exit_action): Thread
+	  may terminate before sysread. [ruby-dev:36835]
+
 Thu Oct 23 22:06:23 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* distruby.rb: removed. "make dist" uses tool/make-snapshot for the 1.9
diff --git a/test/ruby/test_signal.rb b/test/ruby/test_signal.rb
index 7d9acfdc12..9414b6539e 100644
--- a/test/ruby/test_signal.rb
+++ b/test/ruby/test_signal.rb
@@ -41,7 +41,7 @@ class TestSignal < Test::Unit::TestCase
         Signal.trap(:USR1, "EXIT")
         w0.close
         w.syswrite("a")
-        Thread.start { Thread.pass }
+        Thread.start { sleep(2) }
         r0.sysread(4096)
       }
       r.sysread(1)