2 files changed, 6 insertions, 0 deletions
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 dc20ffb2fa..a355aac7a6 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -11,9 +11,11 @@ require "active_resource/railtie"
 require "rails/test_unit/railtie"
 <% end -%>
 
+<% unless options[:skip_bundler] -%>
 # Auto-require default libraries and those for the current Rails environment.
 Bundler.require :default, Rails.env
 
+<% end -%>
 module <%= app_const_base %>
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
index 3cb561d41f..0c7ae74b0a 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
@@ -1,3 +1,6 @@
+<% if options[:skip_bundler] -%>
+require 'rubygems'
+<% else -%>
 # Use Bundler (preferred)
 begin
   require File.expand_path('../../.bundle/environment', __FILE__)
@@ -6,3 +9,4 @@ rescue LoadError
   require 'bundler'
   Bundler.setup
 end
+<% end -%>