diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index a2d14abf019bda38973f01c08d2e8d237128e46a..c4de06d41452ba0891e448c41a5398996fec3afd 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed rake stats to ignore editor backup files like model.rb~ #791 [skanthak]
+
 * Added exception shallowing if the DRb server can't be started (not worth making a fuss about to distract new users) #779 [Tobias Luetke]
 
 * Added an empty favicon.ico file to the public directory of new applications (so the logs are not spammed by its absence)
diff --git a/railties/lib/code_statistics.rb b/railties/lib/code_statistics.rb
index efe8fc24540dd56d1b40bce4e3b6c56e4720200b..ea3c1ad66d414a564a0d969b2df040378599e083 100644
--- a/railties/lib/code_statistics.rb
+++ b/railties/lib/code_statistics.rb
@@ -23,7 +23,7 @@ def calculate_statistics
       @pairs.inject({}) { |stats, pair| stats[pair.first] = calculate_directory_statistics(pair.last); stats }
     end
 
-    def calculate_directory_statistics(directory, pattern = /.*rb/)
+    def calculate_directory_statistics(directory, pattern = /.*\.rb$/)
       stats = { "lines" => 0, "codelines" => 0, "classes" => 0, "methods" => 0 }
 
       Dir.foreach(directory) do |file_name|