diff --git a/ChangeLog b/ChangeLog
index beadaff944..2c4b49297c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 15 22:40:27 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_signal.rb (test_exit_action): skip the test using
+	  fork on fork-less platforms.
+
 Thu Sep 15 13:54:33 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/open-uri.rb: add :read_timeout option.
diff --git a/test/ruby/test_signal.rb b/test/ruby/test_signal.rb
index 6ff33a29aa..8daa1cfa21 100644
--- a/test/ruby/test_signal.rb
+++ b/test/ruby/test_signal.rb
@@ -2,6 +2,15 @@ require 'test/unit'
 require 'timeout'
 
 class TestSignal < Test::Unit::TestCase
+  def have_fork?
+    begin
+      fork{}
+      true
+    rescue NotImplementedError
+      false
+    end
+  end
+
   def test_signal
     defined?(Process.kill) or return
     begin
@@ -25,6 +34,7 @@ class TestSignal < Test::Unit::TestCase
   end
 
   def test_exit_action
+    return unless have_fork?	# snip this test
     begin
       r, w = IO.pipe
       r0, w0 = IO.pipe