diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
index 0354210817..b9d67bac6d 100755
--- a/Library/Homebrew/cmd/audit.rb
+++ b/Library/Homebrew/cmd/audit.rb
@@ -120,6 +120,11 @@ def audit_formula_text name, text
     problems << " * xcodebuild should be passed an explicit \"SYMROOT\""
   end if strict?
 
+  # using ARGV.flag? for formula options is generally a bad thing
+  if text =~ /ARGV\.flag\?/
+    problems << " * Use 'ARGV.include?' instead of 'ARGV.flag?'"
+  end
+
   return problems
 end
 
@@ -128,7 +133,7 @@ def audit_formula_options f, text
 
   # Find possible options
   options = []
-  text.scan(/ARGV\.(include|flag)\?[ ]*\(?(['"])(.+?)\2/) { |m| options << m[2] }
+  text.scan(/ARGV\.include\?[ ]*\(?(['"])(.+?)\1/) { |m| options << m[1] }
   options.reject! {|o| o.include? "#"}
   options.uniq!