diff --git a/ChangeLog b/ChangeLog
index f3d65899a6..43ed95bc2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 14 15:16:40 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_variable.rb (TestVariable#test_global_variable_0):
+	  add test of $0.
+
 Mon Jul 14 13:36:15 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/socket/extconf.rb: initialize winsock on win32 to avoid error
diff --git a/test/ruby/test_variable.rb b/test/ruby/test_variable.rb
index bfa5977f62..de9bc30d77 100644
--- a/test/ruby/test_variable.rb
+++ b/test/ruby/test_variable.rb
@@ -1,4 +1,5 @@
 require 'test/unit'
+require_relative 'envutil'
 
 class TestVariable < Test::Unit::TestCase
   class Gods
@@ -75,4 +76,12 @@ class TestVariable < Test::Unit::TestCase
       end
     end.call
   end
+
+  def test_global_variable_0
+    EnvUtil.rubyexec("-e", "$0='t'*1000;print $0") do |w, r, e|
+      w.close
+      assert_equal("", e.read)
+      assert_match(/\At+\z/, r.read)
+    end
+  end
 end