diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
index 55e5b8d816..b983f98a48 100644
--- a/Library/Homebrew/cmd/audit.rb
+++ b/Library/Homebrew/cmd/audit.rb
@@ -345,10 +345,16 @@ class FormulaAuditor
     end
 
     # Comments from default template
+    if (text =~ /# PLEASE REMOVE/)
+      problem "Please remove default template comments"
+    end
     if (text =~ /# if this fails, try separate make\/make install steps/)
       problem "Please remove default template comments"
     end
-    if (text =~ /# PLEASE REMOVE/)
+    if (text =~ /# if your formula requires any X11\/XQuartz components/)
+      problem "Please remove default template comments"
+    end
+    if (text =~ /# if your formula's build system can't parallelize/)
       problem "Please remove default template comments"
     end