diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb
index d6cc29ceb60f85a51f657ffa344656681dda07fc..582fdd0fd86ff00f0d9ee5b11528fb1897b906b7 100644
--- a/Library/Homebrew/tap.rb
+++ b/Library/Homebrew/tap.rb
@@ -235,7 +235,7 @@ class Tap
 
     if official? && DEPRECATED_OFFICIAL_TAPS.include?(repo)
       odie "#{name} was deprecated. This tap is now empty and all its contents were either deleted or migrated."
-    elsif user == "caskroom"
+    elsif user == "caskroom" || name == "phinze/cask"
       new_repo = repo == "cask" ? "cask" : "cask-#{repo}"
       odie "#{name} was moved. Tap homebrew/#{new_repo} instead."
     end