diff --git a/ChangeLog b/ChangeLog
index 6aa8cca40e..5a5a6231bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 14 12:22:32 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_variable.rb (TestVariable#test_variable): add
+	  a test of [ruby-dev:36698].
+
 Tue Oct 14 11:14:26 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* lib/net/pop.rb: check for invalid APOP timestamp. (CVE-2007-1558)
diff --git a/test/ruby/test_variable.rb b/test/ruby/test_variable.rb
index 5a0c7800bb..c0c386040f 100644
--- a/test/ruby/test_variable.rb
+++ b/test/ruby/test_variable.rb
@@ -40,6 +40,7 @@ class TestVariable < Test::Unit::TestCase
     assert_raise(NameError) do
       $$ = 5
     end
+    assert_normal_exit("$*=0; $*", "[ruby-dev:36698]")
 
     foobar = "foobar"
     $_ = foobar