diff --git a/.rubocop.yml b/.rubocop.yml
index 2ebb26cff..91f28fdb1 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -40,7 +40,7 @@ Metrics/BlockLength:
 
 # No space makes the method definition shorter and differentiates
 # from a regular assignment.
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: no_space
 
 # Single quotes being faster is hardly measurable and only affects parse time.
@@ -55,7 +55,7 @@ Style/SymbolArray:
   Enabled: true
 
 # Most readable form.
-Style/AlignHash:
+Layout/AlignHash:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
 
@@ -92,7 +92,7 @@ Style/RaiseArgs:
 
 # Indenting the chained dots beneath each other is not supported by this cop,
 # see https://github.com/bbatsov/rubocop/issues/1633
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   Enabled: false
 
 # Fail is an alias of raise. Avoid aliases, it's more cognitive load for no gain.
@@ -107,7 +107,7 @@ Style/SignalException:
 Lint/HandleExceptions:
   Enabled: false
 
-Style/SpaceInsideBlockBraces:
+Layout/SpaceInsideBlockBraces:
   # The space here provides no real gain in readability while consuming
   # horizontal space that could be used for a better parameter name.
   # Also {| differentiates better from a hash than { | does.
@@ -115,7 +115,7 @@ Style/SpaceInsideBlockBraces:
 
 # No trailing space differentiates better from the block:
 # foo} means hash, foo } means block.
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
 # { ... } for multi-line blocks is okay, follow Weirichs rule instead:
@@ -165,7 +165,7 @@ Style/NumericPredicate:
   EnforcedStyle: comparison
 
 # Reset some HoundCI changes back to Rubocop defaults
-Style/DotPosition:
+Layout/DotPosition:
   EnforcedStyle: leading
 
 ### backward compatibility
diff --git a/Gemfile b/Gemfile
index 7400c16d0..f8db0150d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -254,7 +254,7 @@ group :development do
   gem "pronto-haml",    "0.9.0", require: false
   gem "pronto-rubocop", "0.9.0", require: false
   gem "pronto-scss",    "0.9.1", require: false
-  gem "rubocop",        "0.48.1", require: false
+  gem "rubocop",        "0.49.1", require: false
 
   # Preloading environment
 
diff --git a/Gemfile.lock b/Gemfile.lock
index e80a03a12..08e36fb9f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -428,6 +428,7 @@ GEM
       validate_url
       webfinger (>= 1.0.1)
     orm_adapter (0.5.0)
+    parallel (1.11.2)
     parser (2.4.0.0)
       ast (~> 2.2)
     pg (0.21.0)
@@ -597,7 +598,8 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.48.1)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -864,7 +866,7 @@ DEPENDENCIES
   redcarpet (= 3.4.0)
   responders (= 2.4.0)
   rspec-rails (= 3.5.2)
-  rubocop (= 0.48.1)
+  rubocop (= 0.49.1)
   ruby-oembed (= 0.12.0)
   rubyzip (= 1.2.1)
   sass-rails (= 5.0.6)