diff --git a/ChangeLog b/ChangeLog
index 9eeec203f1..45939b6570 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 14 22:33:21 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/find.rb (Find.find): rescue only ENOENT and EACCES for lstat.
+
 Mon Dec 14 21:49:30 2009  Tanaka Akira  <akr@fsij.org>
 
 	* lib/find.rb (Find.find): narrow rescue region.
diff --git a/lib/find.rb b/lib/find.rb
index 7727bbdbbc..2b2864cb34 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -41,7 +41,7 @@ module Find
 	yield file.dup.taint
         begin
           s = File.lstat(file)
-        rescue SystemCallError
+        rescue Errno::ENOENT, Errno::EACCES
           next
         end
         if s.directory? then