diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index f3da431b091ebb1b4389d9b56c96d163cf765844..fa764ef02de74a29a020b9ecfcc8e2105b1c0811 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   The application generator writes a new file `config/spring.rb`, which tells
+    Spring to watch additional common files.
+
+    *Xavier Noria*
+
 *   The tasks in the rails task namespace is deprecated in favor of app namespace.
     (e.g. `rails:update` and `rails:template` tasks is renamed to `app:update` and `app:template`.)
 
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 7bab3fdf74f02f616683ca206cd282495a88cd54..562193bc3a0e3bafb8ddeaf82f742d7c52ceaf66 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -80,6 +80,7 @@ def config
         template "secrets.yml"
         template "cable.yml" unless options[:skip_action_cable]
         template "puma.rb"   unless options[:skip_puma]
+        template "spring.rb" if spring_install?
 
         directory "environments"
         directory "initializers"
diff --git a/railties/lib/rails/generators/rails/app/templates/config/spring.rb b/railties/lib/rails/generators/rails/app/templates/config/spring.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c9119b40c08eff8aef2d607f5bf42424483cbd15
--- /dev/null
+++ b/railties/lib/rails/generators/rails/app/templates/config/spring.rb
@@ -0,0 +1,6 @@
+%w(
+  .ruby-version
+  .rbenv-vars
+  tmp/restart.txt
+  tmp/caching-dev.txt
+).each { |path| Spring.watch(path) }
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 63655044da9013acfa36237c76f9aaa81b07e517..a86f190bb27b73f7429656544af6cdc3fca9584b 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -28,6 +28,7 @@
   config/locales
   config/cable.yml
   config/puma.rb
+  config/spring.rb
   db
   lib
   lib/tasks
@@ -681,6 +682,7 @@ def test_spring_no_fork
   def test_skip_spring
     run_generator [destination_root, "--skip-spring"]
 
+    assert_no_file 'config/spring.rb'
     assert_file "Gemfile" do |content|
       assert_no_match(/spring/, content)
     end