diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
index da07d207f2..f21df6e26f 100644
--- a/Library/Homebrew/cmd/audit.rb
+++ b/Library/Homebrew/cmd/audit.rb
@@ -463,6 +463,12 @@ class FormulaAuditor
     end
   end
 
+  def audit_bottle_spec
+    if formula.bottle_disabled? && !formula.bottle_disable_reason.valid?
+      problem "Unrecognized bottle modifier"
+    end
+  end
+
   def audit_github_repository
     return unless @online
 
@@ -904,6 +910,7 @@ class FormulaAuditor
     audit_specs
     audit_desc
     audit_homepage
+    audit_bottle_spec
     audit_github_repository
     audit_deps
     audit_conflicts
diff --git a/Library/Homebrew/formula_support.rb b/Library/Homebrew/formula_support.rb
index c76ed39f3c..3d7f347b94 100644
--- a/Library/Homebrew/formula_support.rb
+++ b/Library/Homebrew/formula_support.rb
@@ -58,6 +58,8 @@ end
 
 # Used to annotate formulae that don't require compiling or cannot build bottle.
 class BottleDisableReason
+  SUPPORTED_TYPES = [:unneeded, :disabled]
+
   def initialize(type, reason)
     @type = type
     @reason = reason
@@ -67,6 +69,10 @@ class BottleDisableReason
     @type == :unneeded
   end
 
+  def valid?
+    SUPPORTED_TYPES.include? @type
+  end
+
   def to_s
     if @type == :unneeded
       "This formula doesn't require compiling."