diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 334ee33a3b95a40c0f1c736f6df50b54c54b51f9..1418c7ab39683a9a185af02fb0cd91bf94e8cd96 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   `rails stats` will now count TypeScript files toward JavaScript stats
+
+    *Joshua Cody*
+
 *   Run `git init` when generating plugins.
 
     Opt out with `--skip-git`.
diff --git a/railties/lib/rails/code_statistics.rb b/railties/lib/rails/code_statistics.rb
index cf7bca9d51e36a98262dcd075bead981556cec1a..9556b659ee7821205c3f7f17b1300b3183b59295 100644
--- a/railties/lib/rails/code_statistics.rb
+++ b/railties/lib/rails/code_statistics.rb
@@ -38,7 +38,7 @@ def calculate_statistics
       Hash[@pairs.map { |pair| [pair.first, calculate_directory_statistics(pair.last)] }]
     end
 
-    def calculate_directory_statistics(directory, pattern = /^(?!\.).*?\.(rb|js|coffee|rake)$/)
+    def calculate_directory_statistics(directory, pattern = /^(?!\.).*?\.(rb|js|ts|coffee|rake)$/)
       stats = CodeStatisticsCalculator.new
 
       Dir.foreach(directory) do |file_name|