diff --git a/ChangeLog b/ChangeLog
index 27704274a5..6f366cf9aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,11 @@ Fri Mar 13 19:41:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
 	  [ruby-core:20131]
 
+Fri Mar 13 09:17:12 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils#fu_get_gid): stringify group
+	  argument before making regexp match.  [ruby-dev:38155]
+
 Thu Mar 12 15:26:02 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* test/openssl/test_ssl.rb (OpenSSL#test_client_session):
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 3117579e15..35ca983bcf 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -985,6 +985,7 @@ module FileUtils
 
     def fu_get_gid(group)   #:nodoc:
       return nil unless group
+      group = group.to_s
       if /\A\d+\z/ =~ group
       then group.to_i
       else Etc.getgrnam(group).gid