diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index d9393a2a9e..6e4482b7c4 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -49,7 +49,7 @@ end
 class Bintray
   def self.repository(tap=nil)
     return "bottles" if tap.to_s.empty?
-    "bottles-#{tap.sub(/^homebrew\/homebrew-/i, "")}"
+    "bottles-#{tap.sub(/^homebrew\/(homebrew-)?/i, "")}"
   end
 
   def self.version(path)