diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee
index 8ad43736..d2dc1b24 100644
--- a/assets/javascripts/templates/pages/about_tmpl.coffee
+++ b/assets/javascripts/templates/pages/about_tmpl.coffee
@@ -668,7 +668,7 @@ credits = [
     'https://www.ruby-lang.org/en/about/license.txt'
   ], [
     'Ruby on Rails',
-    '2004-2017 David Heinemeier Hansson<br>Rails, Ruby on Rails, and the Rails logo are trademarks of David Heinemeier Hansson.',
+    '2004-2019 David Heinemeier Hansson<br>Rails, Ruby on Rails, and the Rails logo are trademarks of David Heinemeier Hansson.',
     'MIT',
     'https://raw.githubusercontent.com/rails/rails/master/activerecord/MIT-LICENSE'
   ], [
diff --git a/lib/docs/scrapers/rdoc/rails.rb b/lib/docs/scrapers/rdoc/rails.rb
index 0dec42a9..aed22acb 100644
--- a/lib/docs/scrapers/rdoc/rails.rb
+++ b/lib/docs/scrapers/rdoc/rails.rb
@@ -45,6 +45,15 @@ module Docs
       ActiveSupport/Dependencies/WatchStack.html
       ActiveSupport/Notifications/Fanout.html)
 
+    # False positives found by docs:generate
+    options[:skip].concat %w(
+      ActionDispatch/www.example.com
+      ActionDispatch/Http/www.rubyonrails.org
+      ActionDispatch/Http/www.rubyonrails.co.uk
+      'TZ'
+      active_record_migrations.html
+      association_basics.html)
+
     options[:skip_patterns] += [
       /release_notes/,
       /\AActionController\/Testing/,
@@ -63,17 +72,21 @@ module Docs
     options[:attribution] = ->(filter) do
       if filter.slug.start_with?('guides')
         <<-HTML
-          &copy; 2004&ndash;2018 David Heinemeier Hansson<br>
+          &copy; 2004&ndash;2019 David Heinemeier Hansson<br>
           Licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
         HTML
       else
         <<-HTML
-          &copy; 2004&ndash;2018 David Heinemeier Hansson<br>
+          &copy; 2004&ndash;2019 David Heinemeier Hansson<br>
           Licensed under the MIT License.
         HTML
       end
     end
 
+    version '6.0' do
+      self.release = '6.0.0'
+    end
+
     version '5.2' do
       self.release = '5.2.2'
     end