diff --git a/README.md b/README.md
index 4e953550dac..7e760173fbf 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Homebrew-Cask
 
-#### Important: Homebrew-Cask changed its default Caskroom location. See the relevant [issue](https://github.com/caskroom/homebrew-cask/issues/21603) and [pull request](https://github.com/caskroom/homebrew-cask/pull/21857) for details. If you have been bitten by this change, please [see this](https://github.com/caskroom/homebrew-cask/issues/21894#issuecomment-225464059) before commenting or opening an issue.
+#### Important: Homebrew-Cask changed its default Caskroom location. See the relevant [issue](https://github.com/caskroom/homebrew-cask/issues/21603) and [pull request](https://github.com/caskroom/homebrew-cask/pull/21857) for details. If you are getting a warning about this and are unsure how to proceed, see [this issue](https://github.com/caskroom/homebrew-cask/issues/21913) for a brief explanation of each option.
 
 #### Important: Homebrew-Cask changed its behaviour from linking apps to moving them. See the relevant [issue](https://github.com/caskroom/homebrew-cask/issues/13201) and [pull request](https://github.com/caskroom/homebrew-cask/pull/13966) for details.
 ---
diff --git a/lib/hbc/locations.rb b/lib/hbc/locations.rb
index d414aaa4a5b..6f2f2b69d03 100644
--- a/lib/hbc/locations.rb
+++ b/lib/hbc/locations.rb
@@ -22,6 +22,8 @@ module Hbc::Locations
             Caskroom at #{legacy_caskroom}, add the following to your HOMEBREW_CASK_OPTS:
 
               --caskroom=#{legacy_caskroom}
+
+            For more details on each of those options, see https://github.com/caskroom/homebrew-cask/issues/21913.
           EOS
           legacy_caskroom
         else