diff --git a/ChangeLog b/ChangeLog
index 362dae5877..4c7074d2cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Oct 30 06:32:52 2010  Tanaka Akira  <akr@fsij.org>
+
+	* test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the
+	  group of the created file is inherited from the parent
+	  directory on BSDs and MacOS X.  Linux also inherit the group if
+	  the setgid bit of the directory is set.  It causes the test fail.
+	  fixed by Shota Fukumori.  [ruby-dev:42458]
+
 Fri Oct 29 03:04:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_dump): fix expected length. [ruby-core:32935]
diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb
index 2be1c23a93..6d44ec1b80 100644
--- a/test/pathname/test_pathname.rb
+++ b/test/pathname/test_pathname.rb
@@ -938,6 +938,7 @@ class TestPathname < Test::Unit::TestCase
     skip "Unix file owner test" if DOSISH
     with_tmpchdir('rubytest-pathname') {|dir|
       open("f", "w") {|f| f.write "abc" }
+      File.chown(-1, Process.gid, "f")
       assert_equal(true, Pathname("f").grpowned?)
     }
   end
diff --git a/version.h b/version.h
index d655cfd117..55af1f7d52 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 84
+#define RUBY_PATCHLEVEL 85
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1