diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb
index fb9d52ffe7..4aef73ebac 100644
--- a/Library/Homebrew/cmd/bottle.rb
+++ b/Library/Homebrew/cmd/bottle.rb
@@ -145,6 +145,12 @@ module Homebrew
       return ofail "Formula not installed or up-to-date: #{f.full_name}"
     end
 
+    if f.bottle_disabled?
+      ofail "Formula has disabled bottle: #{f.full_name}"
+      puts f.bottle_disable_reason
+      return
+    end
+
     unless built_as_bottle? f
       return ofail "Formula not installed with '--build-bottle': #{f.full_name}"
     end
@@ -288,6 +294,12 @@ module Homebrew
       ohai formula_name
       f = Formulary.factory(formula_name)
 
+      if f.bottle_disabled?
+        ofail "Formula #{f.full_name} has disabled bottle"
+        puts f.bottle_disable_reason
+        next
+      end
+
       bottle = if keep_old
         f.bottle_specification.dup
       else