diff --git a/ChangeLog b/ChangeLog
index acb57069cb..0d9e2524a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul  4 00:12:37 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/find.rb: merge from 1.7: rescue Errno::EACCES as well.
+
 Wed Jul  4 00:09:16 2001  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/mathn.rb: merge from 1.7: add Rational#inspect().
diff --git a/lib/find.rb b/lib/find.rb
index b220018b6b..3c16533794 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -32,7 +32,7 @@ module Find
 	      d.close
 	    end
 	  end
-	rescue Errno::ENOENT
+       rescue Errno::ENOENT, Errno::EACCES
 	end
       end
     end