diff --git a/.rubocop.yml b/.rubocop.yml
index e3ea0b991a7ef79c11525ae8dcc6a8af3b4a1f1c..2e55fe82e56b08534a53b252e29fef4f0e0c856b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -36,10 +36,8 @@ Style/AlignHash:
   EnforcedColonStyle: table
 
 # Mixing the styles looks just silly.
-# REVIEW: Enable once https://github.com/bbatsov/rubocop/commit/760ce1ed2cf10beda5e163f934c03a6fb6daa38e
-#   is released.
-#Style/HashSyntax:
-#  EnforcedStyle: ruby19_no_mixed_keys
+Style/HashSyntax:
+ EnforcedStyle: ruby19_no_mixed_keys
 
 # has_key? and has_value? are far more readable than key? and value?
 Style/DeprecatedHashMethods:
@@ -93,7 +91,7 @@ Style/SpaceInsideHashLiteralBraces:
 
 # { ... } for multi-line blocks is okay, follow Weirichs rule instead:
 # https://web.archive.org/web/20140221124509/http://onestepback.org/index.cgi/Tech/Ruby/BraceVsDoEnd.rdoc
-Style/Blocks:
+Style/BlockDelimiters:
   Enabled: false
 
 # do / end blocks should be used for side effects,
diff --git a/Gemfile b/Gemfile
index 508c7cfa34b22fc81d595b7bc4d6b71768fd8d9d..0006bbc27dd5acffebefd177bedf10c24be8d9ad 100644
--- a/Gemfile
+++ b/Gemfile
@@ -227,7 +227,7 @@ group :development do
 
   # Linters
   gem "jshintrb", "0.3.0"
-  gem "rubocop",  "0.29.1"
+  gem "rubocop",  "0.31.0"
 
   # Preloading environment
 
diff --git a/Gemfile.lock b/Gemfile.lock
index d29fa32d84d4269defa7ae48cc9ebb445d25791c..b1f2499e80510ce92d7b54fd7cc6aed38dd57eb7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -447,10 +447,10 @@ GEM
       faraday (~> 0.9.0)
       nokogiri (~> 1.6)
     orm_adapter (0.5.0)
-    parser (2.2.0.3)
+    parser (2.2.2.2)
       ast (>= 1.1, < 3.0)
     phantomjs (1.9.8.0)
-    powerpack (0.1.0)
+    powerpack (0.1.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -601,9 +601,9 @@ GEM
       rspec-mocks (~> 3.2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    rubocop (0.29.1)
+    rubocop (0.31.0)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.1, < 3.0)
+      parser (>= 2.2.2.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
@@ -808,7 +808,7 @@ DEPENDENCIES
   roxml (= 3.1.6)
   rspec-instafail (= 0.2.6)
   rspec-rails (= 3.2.1)
-  rubocop (= 0.29.1)
+  rubocop (= 0.31.0)
   ruby-oembed (= 0.8.14)
   sass-rails (= 5.0.1)
   selenium-webdriver (= 2.45.0)