diff --git a/Library/Homebrew/compat/tap.rb b/Library/Homebrew/compat/tap.rb
index 835b1ea48e..7d2b378577 100644
--- a/Library/Homebrew/compat/tap.rb
+++ b/Library/Homebrew/compat/tap.rb
@@ -5,6 +5,9 @@ class Tap
 
       return unless user == "caskroom"
 
+      old_initial_revision_var = "HOMEBREW_UPDATE_BEFORE#{repo_var}"
+      old_current_revision_var = "HOMEBREW_UPDATE_AFTER#{repo_var}"
+
       new_user = "Homebrew"
       new_repo = (repo == "cask") ? repo : "cask-#{repo}"
 
@@ -14,6 +17,12 @@ class Tap
 
       super(new_user, new_repo)
 
+      new_initial_revision_var = "HOMEBREW_UPDATE_BEFORE#{repo_var}"
+      new_current_revision_var = "HOMEBREW_UPDATE_AFTER#{repo_var}"
+
+      ENV[new_initial_revision_var] ||= ENV[old_initial_revision_var]
+      ENV[new_current_revision_var] ||= ENV[old_current_revision_var]
+
       return unless old_path.git?
 
       new_name = name