diff --git a/ChangeLog b/ChangeLog
index 3f82d1eb30..9a96503efc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 Mon May 24 05:15:00 2010 Kirk Haines <khaines@ruby-lang.org>
 
-	* configure.in: Bug #2553 [ruby-core:27380]; Add a --disable-ucontext option, for use with --enable-pthreads, to avoid performance loss from --enable-pthreads and the oodles of sigprocmask calls that normally brings.
+	* configure.in: Bug #2553 [ruby-core:27380]; Add a --disable-ucontext option, for use with --enable-pthreads, to avoid performance loss from --enable-pthreads and the oodles of sigprocmask calls that normally brings. r27999
+
+	* lib/fileutils.rb: Backport #1700 [ruby-core:24078]; stringify group argument in #fu_get_gid before making regexp match.
 
 Thu May 20 04:10:00 2010 Kirk Haines <khaines@ruby-lang.org>
 
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 3fdb6cbfe6..3ef80ed601 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -984,6 +984,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