diff --git a/ChangeLog b/ChangeLog
index 8c08e15445..5a11b99d65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 24 01:22:19 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bootstraptest/test_thread.rb: fix for environment where fork is not
+	  available.
+
 Tue Feb 24 01:19:38 2009  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* thread.c (thread_cleanup_func): unlock all locked mutexes even when
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
index e586ee274e..02cd2029aa 100644
--- a/bootstraptest/test_thread.rb
+++ b/bootstraptest/test_thread.rb
@@ -219,9 +219,13 @@ assert_equal 'true', %{
 assert_equal 'ok', %{
   open("zzz.rb", "w") do |f|
     f.puts <<-END
-      Thread.new { fork { GC.start } }.join
-      pid, status = Process.wait2
-      $result = status.success? ? :ok : :ng
+      begin
+        Thread.new { fork { GC.start } }.join
+        pid, status = Process.wait2
+        $result = status.success? ? :ok : :ng
+      rescue NotImplementedError
+        :ok
+      end
     END
   end
   require "zzz.rb"