diff --git a/Library/Homebrew/cleanup.rb b/Library/Homebrew/cleanup.rb
index 0b4d97d59e..d08c586718 100644
--- a/Library/Homebrew/cleanup.rb
+++ b/Library/Homebrew/cleanup.rb
@@ -83,7 +83,7 @@ module Homebrew
           version = file.version
         end
         next unless version
-        next unless (name = file.basename.to_s[/(.*)-(?:#{Regexp.escape(version)})/, 1])
+        next unless (name = file.basename.to_s[/\A(.*?)\-\-?(?:#{Regexp.escape(version)})/, 1])
 
         next unless HOMEBREW_CELLAR.directory?
 
diff --git a/Library/Homebrew/test/cleanup_spec.rb b/Library/Homebrew/test/cleanup_spec.rb
index 40ab4280b7..2ad1858da3 100644
--- a/Library/Homebrew/test/cleanup_spec.rb
+++ b/Library/Homebrew/test/cleanup_spec.rb
@@ -226,8 +226,8 @@ describe Homebrew::Cleanup do
     end
 
     context "cleans old files in HOMEBREW_CACHE" do
-      let(:bottle) { (HOMEBREW_CACHE/"testball-0.0.1.bottle.tar.gz") }
-      let(:testball) { (HOMEBREW_CACHE/"testball-0.0.1") }
+      let(:bottle) { (HOMEBREW_CACHE/"testball--0.0.1.bottle.tar.gz") }
+      let(:testball) { (HOMEBREW_CACHE/"testball--0.0.1") }
 
       before do
         FileUtils.touch(bottle)