diff --git a/ChangeLog b/ChangeLog
index 91641a7e5e..6269cf1624 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep  9 10:44:46 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_env.rb (test_aset): OpenBSD acts like NetBSD in
+	  that it ignores characters after = in ENV.
+	  patched by Jeremy Evans [ruby-core:32184]
+
 Thu Sep  9 09:02:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* tool/rbinstall.rb (install?): gemspec filename should include
diff --git a/test/ruby/test_env.rb b/test/ruby/test_env.rb
index 060c50e68e..785b6bb067 100644
--- a/test/ruby/test_env.rb
+++ b/test/ruby/test_env.rb
@@ -123,7 +123,7 @@ class TestEnv < Test::Unit::TestCase
     assert_equal(nil, ENV["test"])
     assert_raise(ArgumentError) { ENV["foo\0bar"] = "test" }
     assert_raise(ArgumentError) { ENV["test"] = "foo\0bar" }
-    if /netbsd/ =~ RUBY_PLATFORM
+    if /netbsd|openbsd/ =~ RUBY_PLATFORM
       ENV["foo=bar"] = "test"
       assert_equal("test", ENV["foo=bar"])
       assert_equal("test", ENV["foo"])