diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 8503559d5e..12e139de84 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -81,12 +81,13 @@ module HomebrewArgvExtension
     include? '--32-bit'
   end
 
+  def build_bottle?
+    MacOS.bottles_supported? and include? '--build-bottle'
+  end
+
   def build_from_source?
-    return true if flag? '--build-from-source' or ENV['HOMEBREW_BUILD_FROM_SOURCE'] \
-      or not MacOS.lion? or HOMEBREW_PREFIX.to_s != '/usr/local'
-    options = options_only
-    options.delete '--universal'
-    not options.empty?
+    flag? '--build-from-source' or ENV['HOMEBREW_BUILD_FROM_SOURCE'] \
+      or not MacOS.bottles_supported? or not options_only.empty?
   end
 
   def flag? flag
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index 4de58cc362..7ecb7e574b 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -398,6 +398,10 @@ module MacOS extend self
   def prefer_64_bit?
     Hardware.is_64_bit? and 10.6 <= MACOS_VERSION
   end
+
+  def bottles_supported?
+    lion? and HOMEBREW_PREFIX.to_s == '/usr/local'
+  end
 end
 
 module GitHub extend self