diff --git a/Library/Homebrew/cask/lib/hbc/exceptions.rb b/Library/Homebrew/cask/lib/hbc/exceptions.rb
index 8a128a52bf..14c52e94bd 100644
--- a/Library/Homebrew/cask/lib/hbc/exceptions.rb
+++ b/Library/Homebrew/cask/lib/hbc/exceptions.rb
@@ -84,13 +84,11 @@ module Hbc
   class CaskX11DependencyError < AbstractCaskErrorWithToken
     def to_s
       <<-EOS.undent
-        #{token} requires XQuartz/X11, which can be installed via homebrew-cask by
-
+        #{token} requires XQuartz/X11, which can be installed using Homebrew-Cask by running
           brew cask install xquartz
 
         or manually, by downloading the package from
-
-          https://www.xquartz.org/
+          #{Formatter.url("https://www.xquartz.org/")}
       EOS
     end
   end
diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index 0f37e8af57..9c106acf15 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -292,8 +292,9 @@ module Homebrew
 
         <<-EOS.undent
           Your XQuartz (#{installed_version}) is outdated.
-          Please install XQuartz #{latest_version} (or delete it):
-            https://xquartz.macosforge.org
+          Please install XQuartz #{latest_version} (or delete the current version).
+          XQuartz can be updated using Homebrew-Cask by running
+            brew cask reinstall xquartz
         EOS
       end