diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index e2f2148911..1d7513a84f 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -3,6 +3,12 @@
 
     *Terence Lee*
 
+*   The configuration option `config.assets.precompile` is no longer
+    in `config/environments/production.rb` but in
+    `config/application.rb`.
+
+    *Yves Senn*
+
 *   Add notice message for destroy action in scaffold generator.
 
     *Rahul P. Chaudhari*
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index daf399a538..1275bce7e6 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -31,6 +31,10 @@ module <%= app_const_base %>
 
     # Disable the asset pipeline.
     config.assets.enabled = false
+<% else %>
+  # Precompile additional assets.
+  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+  # config.assets.precompile += %w( search.js )
 <% end -%>
   end
 end
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index 0ab91d9864..1f0111368b 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -59,12 +59,6 @@
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"
 
-  <%- unless options.skip_sprockets? -%>
-  # Precompile additional assets.
-  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-  # config.assets.precompile += %w( search.js )
-  <%- end -%>
-
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false