diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
index 736d114901ba9047aba9d064e15aa2a5ad1cd4fa..b8d68ad0bc8d8fd0b7380e3d7a8b5cda36827e69 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
@@ -17,4 +17,15 @@
 <% unless options.skip_test_unit? -%>
   s.test_files = Dir["test/**/*"]
 <% end -%>
+
+  # If your gem is dependent on a specific version (or higher) of Rails:
+  <%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", ">= <%= Rails::VERSION::STRING %>"
+
+<% unless options[:skip_javascript] || !full? -%>
+  # If your gem contains any <%= "#{options[:javascript]}-specific" %> javascript:
+  # s.add_dependency "<%= "#{options[:javascript]}-rails" %>"
+
+<% end -%>
+  # Declare development-specific dependencies:
+  s.add_development_dependency "<%= gem_for_database %>"
 end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
index 7e6eb1834116dd4c7a0430c8cd328541fc5a125f..160baa690659166a76fb4129ae7579a19a1df52a 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
@@ -1,14 +1,20 @@
 source "http://rubygems.org"
 
-<%= rails_gemfile_entry -%>
+# Declare your gem's dependencies in <%= name %>.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
 
-<% if full? -%>
-<%= database_gemfile_entry -%>
-<% end -%>
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
 
-<% if mountable? -%>
-<%= javascript_gemfile_entry -%>
-<% end -%>
+<% if options.dev? || options.edge? -%>
+# Your gem is dependent on dev or edge Rails. Once you can lock this
+# dependency down to a specific version, move it to your gemspec.
+<%= rails_gemfile_entry -%>
 
+<% end -%>
 # To use debugger
 # <%= ruby_debugger_gemfile_entry %>
\ No newline at end of file