diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.coffee b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js
similarity index 56%
rename from railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.coffee
rename to railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js
index dd90dad1c1..488ac8cd80 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.coffee
+++ b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js
@@ -1,4 +1,4 @@
-# Place your application-specific JavaScript functions and classes here
+# FIXME: Tell people that this is a manifest file, real code should go into discrete files
 # FIXME: Tell people how Sprockets and CoffeeScript works
 #
 #= require jquery