diff --git a/ChangeLog b/ChangeLog
index 28196b12db..94fd225f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 16 21:14:04 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* ruby/test_rubyoptions.rb (TestRubyOptions#test_segv_test):
+	  fixes "NoMethodError: undefined method `[]=' for nil:NilClass"
+
 Sun May 16 17:16:09 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* proc.c (proc_binding): don't propagative filename and line_no of
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index f5bc830830..7b956810a1 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -365,8 +365,8 @@ class TestRubyOptions < Test::Unit::TestCase
   end
 
   def test_segv_test
+    opts = {}
     if /mswin|mingw/ =~ RUBY_PLATFORM
-      opts = {}
       additional = '[\s\w\.\']*'
     else
       opts[:rlimit_core] = 0