--- a/rspec/lib/autotest/rspec.rb
+++ b/rspec/lib/autotest/rspec.rb
@@ -22,15 +22,14 @@ class Autotest::Rspec < Autotest
   def initialize
     super
     self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m
-    self.completed_re = /\Z/ # FIX: some sort of summary line at the end?
+    self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m
   end
   
   def consolidate_failures(failed)
-    filters = Hash.new { |h,k| h[k] = [] }
-    failed.each do |spec, failed_trace|
-      if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) } then
-        filters[f] << spec
-        break
+    filters = new_hash_of_arrays
+    failed.each do |spec, trace|
+      if trace =~ /\n(\.\/)?(.*\.rb):[\d]+:\Z?/
+        filters[$2] << spec
       end
     end
     return filters

--- a/rspec/lib/spec/version.rb
+++ b/rspec/lib/spec/version.rb
@@ -6,7 +6,7 @@ module Spec
       TINY   = 3
       RELEASE_CANDIDATE = nil
 
-      BUILD_TIME_UTC = 20080215164335
+      BUILD_TIME_UTC = 20080216032148
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

--- a/rspec/spec/autotest/rspec_spec.rb
+++ b/rspec/spec/autotest/rspec_spec.rb
@@ -171,7 +171,7 @@ HERE
       common_setup
       @rspec_autotest = Rspec.new
       
-      @spec_file = "./spec/autotest/rspec_spec.rb"
+      @spec_file = "spec/autotest/rspec_spec.rb"
       @rspec_autotest.instance_variable_set("@files", {@spec_file => Time.now})
       @rspec_autotest.stub!(:find_files_to_test).and_return true
     end
@@ -181,14 +181,16 @@ HERE
     end
     
     it "should return a hash with the spec filename => spec name for each failure or error" do
-      @rspec_autotest.stub!(:test_files_for).and_return "./spec/autotest/rspec_spec.rb"
+      @rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/rspec_spec.rb"
       failures = [
         [
           "false should be false", 
           "expected: true,\n     got: false (using ==)\n#{@spec_file}:203:"
         ]
       ]
-      @rspec_autotest.consolidate_failures(failures).should == {@spec_file => ["false should be false"]}
+      @rspec_autotest.consolidate_failures(failures).should == {
+        @spec_file => ["false should be false"]
+      }
     end
     
   end

--- a/rspec_on_rails/lib/spec/rails/version.rb
+++ b/rspec_on_rails/lib/spec/rails/version.rb
@@ -1,7 +1,7 @@
 module Spec
   module Rails
     module VERSION #:nodoc:
-      BUILD_TIME_UTC = 20080215164335
+      BUILD_TIME_UTC = 20080216032148
     end
   end
 end