diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index b9ae24de59ae079fd48eb7ec7476bae314151139..6f5e6315048c11a83de1ac276cd6086eb8fc5503 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -84,6 +84,9 @@ def self.add_shared_options_for(name)
         class_option :skip_system_test,    type: :boolean, default: false,
                                            desc: "Skip system test files"
 
+        class_option :skip_bootsnap,       type: :boolean, default: false,
+                                           desc: "Skip bootsnap gem"
+
         class_option :dev,                 type: :boolean, default: false,
                                            desc: "Setup the #{name} with Gemfile pointing to your Rails checkout"
 
@@ -435,6 +438,10 @@ def depend_on_listen?
         !options[:skip_listen] && os_supports_listen_out_of_the_box?
       end
 
+      def depend_on_bootsnap?
+        !options[:skip_bootsnap]
+      end
+
       def os_supports_listen_out_of_the_box?
         RbConfig::CONFIG["host_os"] =~ /darwin|linux/
       end
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile.tt b/railties/lib/rails/generators/rails/app/templates/Gemfile.tt
index e3ed3e7c11cfed427686fe6d676a482c1b912ff8..23bb89f4ce11f5ca8f4f7b05283a179700614346 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile.tt
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile.tt
@@ -29,9 +29,11 @@ ruby <%= "'#{RUBY_VERSION}'" -%>
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
+<% if depend_on_bootsnap? -%>
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.1.0', require: false
 
+<%- end -%>
 <%- if options.api? -%>
 # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
 # gem 'rack-cors'
diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/boot.rb.tt
index 6246e7bf85165abe4a632019d46988b939983c6c..720d36a2a46065024f9e761dfcb1d906252faab0 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb.tt
@@ -1,7 +1,9 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
+<% if depend_on_bootsnap? -%>
 require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
+<%- end -%>
 
 if %w[s server c console].any? { |a| ARGV.include?(a) }
   puts "=> Booting Rails"
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 96803db838aba5e8704b2e1c9fa7f0f94afb8ba9..9fc63755ae10a0dc657de10d7cac6df231972035 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -792,6 +792,26 @@ def test_generator_if_skip_turbolinks_is_given
     end
   end
 
+  def test_bootsnap
+    run_generator
+
+    assert_gem "bootsnap"
+    assert_file "config/boot.rb" do |content|
+      assert_match(/require 'bootsnap\/setup'/, content)
+    end
+  end
+
+  def test_skip_bootsnap
+    run_generator [destination_root, "--skip-bootsnap"]
+
+    assert_file "Gemfile" do |content|
+      assert_no_match(/bootsnap/, content)
+    end
+    assert_file "config/boot.rb" do |content|
+      assert_no_match(/require 'bootsnap\/setup'/, content)
+    end
+  end
+
   def test_inclusion_of_ruby_version
     run_generator