diff --git a/ChangeLog b/ChangeLog
index 530de64c7d..1ec8ac75ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep  8 02:56:31 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_fiber.rb (TestFiber::test_throw): uncaught throw
+	  now raise ArgumentError exception.
+
 Sat Sep  8 02:45:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* struct.c (rb_struct_s_members): should raise TypeError instead
diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb
index d19daede3a..2756e6b219 100644
--- a/test/ruby/test_fiber.rb
+++ b/test/ruby/test_fiber.rb
@@ -110,7 +110,7 @@ class TestFiber < Test::Unit::TestCase
   end
 
   def test_throw
-    assert_raise(NameError){
+    assert_raise(ArgumentError){
       Fiber.new do
         throw :a
       end.resume