diff --git a/.rubocop.yml b/.rubocop.yml
index c58fbed4c..d3c8146d3 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,4 +1,5 @@
-inherit_from: ./.rubocop_todo.yml
+inherit_from:
+  - .rubocop_todo.yml
 
 AllCops:
   Exclude:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 578f1b345..552b76072 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-03-07 18:25:02 -0800 using RuboCop version 0.65.0.
+# on 2019-06-16 12:01:03 -0700 using RuboCop version 0.68.1.
 # 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
@@ -51,7 +51,7 @@ Layout/AlignArray:
   Exclude:
     - 'spec/annotate/annotate_models_spec.rb'
 
-# Offense count: 103
+# Offense count: 104
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -149,7 +149,7 @@ Layout/EmptyLinesAroundExceptionHandlingKeywords:
 
 # Offense count: 24
 # Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
   Exclude:
     - 'Guardfile'
@@ -170,7 +170,7 @@ Layout/ExtraSpacing:
 # Cop supports --auto-correct.
 # Configuration parameters: IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   EnforcedStyle: consistent
 
 # Offense count: 54
@@ -247,7 +247,7 @@ Layout/SpaceAroundKeyword:
     - 'spec/integration/rails_4.2.0/Gemfile'
     - 'spec/integration/standalone/Gemfile'
 
-# Offense count: 4
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment.
 Layout/SpaceAroundOperators:
@@ -419,15 +419,15 @@ Lint/UnusedBlockArgument:
   Exclude:
     - 'bin/annotate'
 
-# Offense count: 18
+# Offense count: 19
 Metrics/AbcSize:
-  Max: 139
+  Max: 138
 
-# Offense count: 29
+# Offense count: 27
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 1140
+  Max: 244
 
 # Offense count: 1
 # Configuration parameters: CountBlocks.
@@ -475,14 +475,6 @@ Naming/UncommunicativeMethodParamName:
   Exclude:
     - 'Rakefile'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-Performance/RegexpMatch:
-  Exclude:
-    - 'lib/annotate/annotate_models.rb'
-    - 'lib/annotate/annotate_routes.rb'
-    - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
-
 # Offense count: 1
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: inline, group
@@ -688,7 +680,7 @@ Style/NestedParenthesizedCalls:
 Style/NumericLiterals:
   MinDigits: 15
 
-# Offense count: 2
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
@@ -809,7 +801,7 @@ Style/StderrPuts:
     - 'lib/annotate/annotate_models.rb'
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
-# Offense count: 240
+# Offense count: 243
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
@@ -867,8 +859,9 @@ Style/UnneededPercentQ:
     - 'annotate.gemspec'
     - 'spec/integration/rails_2.3_with_bundler/config/boot.rb'
 
-# Offense count: 424
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 431
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 276
diff --git a/Gemfile b/Gemfile
index ccfc11bc9..cd3dae1be 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ group :development, :test do
   gem 'guard-rspec', require: false
   gem 'rspec', require: false
 
-  gem 'rubocop', '~> 0.67.2', require: false unless RUBY_VERSION =~ /^1.8/
+  gem 'rubocop', '~> 0.68.1', require: false unless RUBY_VERSION =~ /^1.8/
   gem 'simplecov', require: false
   gem 'terminal-notifier-guard', require: false