diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index b1f3df2677..35b0f60a9b 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -453,7 +453,7 @@ class Formula
 
         hsh["installed"] << {
           "version" => keg.version.to_s,
-          "used_options" => tab.used_options.map(&:flag),
+          "used_options" => tab.used_options.as_flags,
           "built_as_bottle" => tab.built_bottle,
           "poured_from_bottle" => tab.poured_from_bottle
         }
diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb
index c5286ea4ed..c295fe90e5 100644
--- a/Library/Homebrew/tab.rb
+++ b/Library/Homebrew/tab.rb
@@ -11,8 +11,8 @@ class Tab < OpenStruct
   FILENAME = 'INSTALL_RECEIPT.json'
 
   def self.create(formula, compiler, stdlib, build)
-    Tab.new :used_options => build.used_options.map(&:to_s),
-            :unused_options => build.unused_options.map(&:to_s),
+    Tab.new :used_options => build.used_options.as_flags,
+            :unused_options => build.unused_options.as_flags,
             :tabfile => formula.prefix.join(FILENAME),
             :built_as_bottle => !!ARGV.build_bottle?,
             :poured_from_bottle => false,
@@ -122,8 +122,8 @@ class Tab < OpenStruct
 
   def to_json
     Utils::JSON.dump({
-      :used_options => used_options.map(&:to_s),
-      :unused_options => unused_options.map(&:to_s),
+      :used_options => used_options.as_flags,
+      :unused_options => unused_options.as_flags,
       :built_as_bottle => built_as_bottle,
       :poured_from_bottle => poured_from_bottle,
       :tapped_from => tapped_from,
diff --git a/Library/Homebrew/test/test_tab.rb b/Library/Homebrew/test/test_tab.rb
index 68e5dfb97f..37a2cc06f6 100644
--- a/Library/Homebrew/test/test_tab.rb
+++ b/Library/Homebrew/test/test_tab.rb
@@ -8,8 +8,8 @@ class TabTests < Homebrew::TestCase
     @unused = Options.create(%w(--with-baz --without-qux))
 
     @tab = Tab.new({
-      :used_options       => @used.map(&:to_s),
-      :unused_options     => @unused.map(&:to_s),
+      :used_options       => @used.as_flags,
+      :unused_options     => @unused.as_flags,
       :built_as_bottle    => false,
       :poured_from_bottle => true,
       :tapped_from        => "Homebrew/homebrew",