diff --git a/lib/rake/file_task.rb b/lib/rake/file_task.rb
index 474b7bd93..364d8e395 100644
--- a/lib/rake/file_task.rb
+++ b/lib/rake/file_task.rb
@@ -30,10 +30,10 @@ def timestamp
 
     # Are there any prerequisites with a later time than the given time stamp?
     def out_of_date?(stamp)
-      @prerequisites.any? { |prereq|
+      all_prerequisite_tasks.any? { |prereq|
         prereq_task = application[prereq, @scope]
         if prereq_task.instance_of?(Rake::FileTask)
-          prereq_task.timestamp > stamp || prereq_task.needed?
+          prereq_task.timestamp > stamp || @application.options.build_all
         else
           prereq_task.timestamp > stamp
         end