diff --git a/.rubocop.yml b/.rubocop.yml
index 5557d7814..067c96f2a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,8 +2,15 @@ AllCops:
   RunRailsCops: true
 
   Exclude:
+    - 'Guardfile'
+    # stuff generated by AR and rails
     - 'db/schema.rb'
     - 'db/migrate/*'
+    # spring generated stuff
+    - 'bin/*'
+    # epp support files until 'complexity issues' will be solved
+    - 'spec/support/epp.rb'
+    - 'spec/support/epp_contact_xml_builder.rb'
 
 Metrics/LineLength:
   Max: 120
diff --git a/Guardfile b/Guardfile
index 065ffb602..7b9975def 100644
--- a/Guardfile
+++ b/Guardfile
@@ -24,9 +24,8 @@ group :red_green_refactor, halt_on_fail:true do
     watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
   end
 
-  # Disabled rubocop in guard until old offenses are removed to reduce visual clutter
-  # guard :rubocop do
-  #   watch(%r{.+\.rb$})
-  #   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
-  # end
+   guard :rubocop do
+     watch(%r{.+\.rb$})
+     watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+   end
 end