diff --git a/ChangeLog b/ChangeLog
index b896b44161..1982f4cd58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec  6 23:16:35 2009  Tanaka Akira  <akr@fsij.org>
+
+	* lib/find.rb (Find.find): reduce stat system call.
+
 Sun Dec  6 16:02:15 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/webrick/httpservlet/filehandler.rb: escape filename of index.
diff --git a/lib/find.rb b/lib/find.rb
index ee96e526ef..f9bc754152 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -39,9 +39,13 @@ module Find
     while file = paths.shift
       catch(:prune) do
 	yield file.dup.taint
-        next unless File.exist? file
+        begin
+          s = File.lstat(file)
+        rescue SystemCallError
+          next
+        end
 	begin
-	  if File.lstat(file).directory? then
+	  if s.directory? then
 	    d = Dir.open(file)
 	    begin
 	      for f in d