diff --git a/ChangeLog b/ChangeLog
index bafbfaa9f9..e26449540a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun  3 01:21:51 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_method.rb: add a test.
+
 Tue Jun  3 00:26:48 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* marshal.c (w_object): add a check for modification of array during
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index df0ec792f3..e0267d777f 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -220,4 +220,14 @@ class TestMethod < Test::Unit::TestCase
   def test_caller_negative_level
     assert_raise(ArgumentError) { caller(-1) }
   end
+
+  def test_attrset_ivar
+    c = Class.new
+    c.class_eval { attr_accessor :foo }
+    o = c.new
+    o.method(:foo=).call(42)
+    assert_equal(42, o.foo)
+    assert_raise(ArgumentError) { o.method(:foo=).call(1, 2, 3) }
+    assert_raise(ArgumentError) { o.method(:foo).call(1) }
+  end
 end