diff --git a/Library/Homebrew/options.rb b/Library/Homebrew/options.rb
index 6d62421718..209cfba62c 100644
--- a/Library/Homebrew/options.rb
+++ b/Library/Homebrew/options.rb
@@ -58,7 +58,7 @@ class Options
   include Enumerable
 
   def self.create(array)
-    new array.map { |e| Option.new(e[/^--(.+)$/, 1] || e) }
+    new array.map { |e| Option.new(e[/^--([^=]+=?)(.+)?$/, 1] || e) }
   end
 
   def initialize(*args)