diff --git a/README.md b/README.md
index b1e2eb65..4d63d187 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ See the [installation instructions](https://voormedia.github.io/rails-erd/instal
 
 * Install Graphviz 2.22+ ([how?](https://voormedia.github.io/rails-erd/install.html)). On macOS with Homebrew run `brew install graphviz`.
 
-* Add <tt>gem 'rails-erd', group: :development</tt> to your application's Gemfile
+* Add <tt>gem 'rails-erd', require: false, group: :development</tt> to your application's Gemfile
 
 * Run <tt>bundle exec erd</tt>
 
diff --git a/lib/generators/erd/templates/auto_generate_diagram.rake b/lib/generators/erd/templates/auto_generate_diagram.rake
index 1df06962..2c4c3e9c 100644
--- a/lib/generators/erd/templates/auto_generate_diagram.rake
+++ b/lib/generators/erd/templates/auto_generate_diagram.rake
@@ -2,5 +2,6 @@
 # NOTE: are sensitive to local FS writes, and besides -- it's just not proper
 # NOTE: to have a dev-mode tool do its thing in production.
 if Rails.env.development?
+  require "rails-erd"
   RailsERD.load_tasks
 end
diff --git a/lib/rails_erd/railtie.rb b/lib/rails_erd/railtie.rb
index 4095a031..ddd0df96 100644
--- a/lib/rails_erd/railtie.rb
+++ b/lib/rails_erd/railtie.rb
@@ -4,7 +4,7 @@ module RailsERD
   # of your domain model.
   class Railtie < Rails::Railtie
     rake_tasks do
-      load "rails_erd/tasks.rake"
+      load "tasks/erd.rake"
     end
   end
 end
diff --git a/lib/rails_erd/tasks.rake b/lib/tasks/erd.rake
similarity index 100%
rename from lib/rails_erd/tasks.rake
rename to lib/tasks/erd.rake
diff --git a/test/unit/rake_task_test.rb b/test/unit/rake_task_test.rb
index e2cfba45..82a58736 100644
--- a/test/unit/rake_task_test.rb
+++ b/test/unit/rake_task_test.rb
@@ -5,7 +5,7 @@ class RakeTaskTest < ActiveSupport::TestCase
 
   def setup
     require "rake"
-    load "rails_erd/tasks.rake"
+    load "tasks/erd.rake"
 
     RailsERD.options.filetype = :dot
     RailsERD.options.warn = false