diff --git a/railties/config.ru b/railties/config.ru
new file mode 100644
index 0000000000000000000000000000000000000000..1b9aec18b259eab56a06ac662e49ad2ac1c62f45
--- /dev/null
+++ b/railties/config.ru
@@ -0,0 +1,3 @@
+require File.dirname(__FILE__) + '/config/environment'
+use Rails::Rack::Static
+run ActionController::Dispatcher.new
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 80e8eabfd31a5fd3d4029692fb0caa8174aded86..98fe163455a75df933317732317b5cc785cafbf1 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -46,6 +46,7 @@ def manifest
       # Root
       m.file "fresh_rakefile", "Rakefile"
       m.file "README",         "README"
+      m.file "config.ru",      "config.ru"
 
       # Application
       m.template "helpers/application.rb",        "app/controllers/application.rb", :assigns => { :app_name => @app_name, :app_secret => md5.hexdigest }