diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb
index 3fb5ca65c4..8ed45b239e 100644
--- a/Library/Homebrew/cmd/tap.rb
+++ b/Library/Homebrew/cmd/tap.rb
@@ -121,12 +121,10 @@ module Homebrew
 
   def tap_ref(path)
     case path.to_s
+    when %r{^#{Regexp.escape(HOMEBREW_LIBRARY.to_s)}/Formula}o
+      "Homebrew/homebrew/#{path.basename(".rb")}"
     when HOMEBREW_TAP_PATH_REGEX
-      "#$1/#$2/#{File.basename($3, '.rb')}"
-    when %r{^#{Regexp.escape(HOMEBREW_LIBRARY.to_s)}/Formula/(.+)}o
-      "Homebrew/homebrew/#{File.basename($1, '.rb')}"
-    else
-      nil
+      "#{$1}/#{$2.sub("homebrew-", "")}/#{path.basename(".rb")}"
     end
   end
 end
diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb
index b1ee8d8fef..b85a355b81 100644
--- a/Library/Homebrew/cmd/update.rb
+++ b/Library/Homebrew/cmd/update.rb
@@ -269,7 +269,7 @@ class Report
       when %r{^#{Regexp.escape(HOMEBREW_LIBRARY.to_s)}/Formula}o
         path.basename(".rb").to_s
       when HOMEBREW_TAP_PATH_REGEX
-        "#$1/#{$2.sub("homebrew-", "")}/#{path.basename(".rb")}"
+        "#{$1}/#{$2.sub("homebrew-", "")}/#{path.basename(".rb")}"
       end
     end.compact.sort
   end