2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ab4d4939e..e3076e7e93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 28 22:09:09 2017  Akio Tajima <artonx@yahoo.co.jp>
+
+	* lib/fileutils.rb: rescue Errno:EACCES for chown.
+	  [Bug #12520]
+
 Tue Jun 28 18:38:09 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
 	* ext/digest/md5/md5ossl.h: Remove excess semicolons.
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 979741aa71..74cb4a3e0c 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -1301,7 +1301,7 @@ module FileUtils
         else
           File.chown st.uid, st.gid, path
         end
-      rescue Errno::EPERM
+      rescue Errno::EPERM, Errno::EACCES
         # clear setuid/setgid
         mode &= 01777
       end