diff --git a/.rubocop-guard.yml b/.rubocop-guard.yml
new file mode 100644
index 000000000..0ee03be6b
--- /dev/null
+++ b/.rubocop-guard.yml
@@ -0,0 +1,10 @@
+inherit_from: .rubocop.yml
+
+#
+# Turn off during guard runs
+#
+
+# turn off comment intention check during development 
+# because NerdCommenter honors commented code intentions
+Style/CommentIndentation:
+  Enabled: false
diff --git a/Guardfile b/Guardfile
index 972130966..1910f3be7 100644
--- a/Guardfile
+++ b/Guardfile
@@ -26,9 +26,10 @@ group :red_green_refactor, halt_on_fail:true do
 
   # Martin does not want rubocop
   unless Socket.gethostname == 'martin'
-    guard :rubocop do
+    guard :rubocop, cli: '--display-cop-names -c .rubocop-guard.yml' do
       watch(%r{.+\.rb$})
       watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+      watch(%r{(?:.+/)?\.rubocop-guard\.yml$}) { |m| File.dirname(m[0]) }
     end
   end
 end