diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0e36ae041..abf114a2e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-09-04 11:31:12 +0100 using RuboCop version 0.49.1.
+# on 2017-12-06 17:18:57 +0000 using RuboCop version 0.51.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -21,16 +21,18 @@ Lint/AmbiguousRegexpLiteral:
     - 'spec/unit/puppet/type/mysql_grant_spec.rb'
 
 # Offense count: 1
-Lint/DuplicatedKey:
+Lint/RescueWithoutErrorClass:
   Exclude:
-    - 'spec/classes/mysql_server_backup_spec.rb'
+    - 'lib/facter/mysql_server_id.rb'
 
-# Offense count: 1
-Lint/HandleExceptions:
+# Offense count: 16
+Lint/ReturnInVoidContext:
   Exclude:
-    - 'spec/spec_helper.rb'
+    - 'lib/puppet/provider/mysql_database/mysql.rb'
+    - 'lib/puppet/provider/mysql_user/mysql.rb'
 
 # Offense count: 1
+# Cop supports --auto-correct.
 Lint/ScriptPermission:
   Exclude:
     - 'spec/unit/puppet/functions/mysql_deepmerge_spec.rb'
@@ -40,17 +42,54 @@ Lint/UselessAssignment:
   Exclude:
     - 'spec/unit/puppet/functions/mysql_deepmerge_spec.rb'
 
-# Offense count: 11
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 351
+# Offense count: 56
+# Configuration parameters: Blacklist.
+# Blacklist: END, (?-mix:EO[A-Z]{1})
+Naming/HeredocDelimiterNaming:
+  Exclude:
+    - 'lib/puppet/parser/functions/mysql_deepmerge.rb'
+    - 'lib/puppet/parser/functions/mysql_dirname.rb'
+    - 'lib/puppet/parser/functions/mysql_password.rb'
+    - 'lib/puppet/parser/functions/mysql_strip_hash.rb'
+    - 'spec/acceptance/locales_spec.rb'
+    - 'spec/acceptance/mysql_backup_spec.rb'
+    - 'spec/acceptance/mysql_db_spec.rb'
+    - 'spec/acceptance/mysql_server_spec.rb'
+    - 'spec/acceptance/sql_task_spec.rb'
+    - 'spec/acceptance/types/mysql_database_spec.rb'
+    - 'spec/acceptance/types/mysql_grant_spec.rb'
+    - 'spec/acceptance/types/mysql_plugin_spec.rb'
+    - 'spec/acceptance/types/mysql_user_spec.rb'
+    - 'spec/classes/mysql_server_account_security_spec.rb'
+    - 'spec/classes/mysql_server_backup_spec.rb'
 
-# Offense count: 1
-RSpec/BeforeAfterAll:
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect.
+Performance/HashEachMethods:
   Exclude:
-    - 'spec/acceptance/**/*.rb'
-    - 'spec/unit/puppet/functions/mysql_password_spec.rb'
+    - 'lib/puppet/parser/functions/mysql_strip_hash.rb'
+    - 'lib/puppet/provider/mysql_database/mysql.rb'
+    - 'lib/puppet/provider/mysql_grant/mysql.rb'
+    - 'lib/puppet/provider/mysql_plugin/mysql.rb'
+    - 'lib/puppet/provider/mysql_user/mysql.rb'
+    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
+
+# Offense count: 40
+# Configuration parameters: Prefixes.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/acceptance/mysql_backup_spec.rb'
+    - 'spec/acceptance/types/mysql_user_spec.rb'
+    - 'spec/classes/graceful_failures_spec.rb'
+    - 'spec/classes/mycnf_template_spec.rb'
+    - 'spec/classes/mysql_server_backup_spec.rb'
+    - 'spec/classes/mysql_server_mysqltuner_spec.rb'
+    - 'spec/classes/mysql_server_spec.rb'
+    - 'spec/unit/facter/mysql_server_id_spec.rb'
+    - 'spec/unit/puppet/type/mysql_grant_spec.rb'
+    - 'spec/unit/puppet/type/mysql_user_spec.rb'
 
 # Offense count: 56
 # Configuration parameters: Max.
@@ -86,7 +125,7 @@ RSpec/InstanceVariable:
     - 'spec/unit/puppet/type/mysql_plugin_spec.rb'
     - 'spec/unit/puppet/type/mysql_user_spec.rb'
 
-# Offense count: 38
+# Offense count: 42
 RSpec/MultipleExpectations:
   Max: 4
 
@@ -111,6 +150,11 @@ RSpec/ScatteredLet:
     - 'spec/unit/puppet/provider/mysql_plugin/mysql_spec.rb'
     - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
 
+# Offense count: 1
+Style/CommentedKeyword:
+  Exclude:
+    - 'spec/spec_helper_acceptance.rb'
+
 # Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.