diff --git a/ChangeLog b/ChangeLog
index 4b11892bc0..69d82db0ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Mar 16 18:28:06 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/etc/etc.c (etc_getgrgid): Fix a bug in Etc::getgrgid()
+	  always returning the (real) group entry of the running process;
+	  reported by: UEDA Hiroyuki <ueda AT netforest.ad.jp>
+	  in [ruby-dev:30586].
+
 Fri Mar 16 16:33:58 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/thread/thread.c (unlock_mutex_inner): Make sure that the
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 447d833bc7..486963378b 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -337,7 +337,7 @@ etc_getgrgid(obj, id)
     struct group *grp;
 
     rb_secure(4);
-    gid = getgid();
+    gid = PW_VAL2GID(id);
     grp = getgrgid(gid);
     if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
     return setup_group(grp);
diff --git a/version.h b/version.h
index 7613e060f5..432a0e061a 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-03-16"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070316
-#define RUBY_PATCHLEVEL 2
+#define RUBY_PATCHLEVEL 3
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8