diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index de886ff3dd..9f8763904b 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -119,9 +119,13 @@ module Homebrew
       tab = Tab.for_keg(keg)
     end
 
+    build_options = BuildOptions.new(Options.create(ARGV.flags_only), f.options)
+    options = build_options.used_options
+    options |= f.build.used_options
+    options &= f.options
+
     fi = FormulaInstaller.new(f)
-    fi.options  = f.build.used_options
-    fi.options &= f.options
+    fi.options = options
     fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?)
     fi.installed_on_request = !ARGV.named.empty?
     fi.link_keg             = keg_was_linked if keg_had_linked_opt