diff --git a/.rubocop.yml b/.rubocop.yml
index 7789d6c2..7078560c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,19 +1,19 @@
 AllCops:
-  Includes:
-    - Rakefile
-    - Gemfile
-    - config.ru
-    - gem_rake_helper.rb
-  Excludes:
-    - script/**
-    - vendor/**
-    - bin/**
-    - middleman-core/lib/vendored-middleman-deps/**
-    - middleman-core/bin/**
-    - middleman-core/fixtures/**
-    - middleman-core/features/**
-    - middleman-core/spec/**
-    - middleman-templates/lib/middleman-templates/**
+  Include:
+    - '**/Rakefile'
+    - '**/Gemfile'
+    - '**/config.ru'
+    - '**/gem_rake_helper.rb'
+  Exclude:
+    - 'script/**/*'
+    - 'vendor/**/*'
+    - '**/tmp/**/*'
+    - '**/bin/**/*'
+    - 'middleman-core/lib/middleman-core/step_definitions/**/*'
+    - 'middleman-templates/lib/middleman-templates/**/*'
+    - 'middleman-core/fixtures/**/*'
+    - 'middleman-core/features/**/*'
+    - 'middleman-core/spec/**/*'
 LineLength:
   Enabled: false
 MethodLength:
@@ -25,4 +25,28 @@ Documentation:
 Encoding:
   Enabled: false
 HashSyntax:
-  EnforcedStyle: ruby19
\ No newline at end of file
+  EnforcedStyle: ruby19
+SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+Blocks:
+  Enabled: false
+PerlBackrefs:
+  Enabled: false
+ClassAndModuleChildren:
+  Enabled: false
+AssignmentInCondition:
+  Enabled: false
+CyclomaticComplexity:
+  Enabled: false
+HandleExceptions:
+  Enabled: false
+EndAlignment:
+  AlignWith: variable
+SignalException:
+  Enabled: false
+RegexpLiteral:
+  Enabled: false
+FormatString:
+  Enabled: false
+CaseIndentation:
+  IndentWhenRelativeTo: end