diff --git a/Casks/google-chrome-beta.rb b/Casks/google-chrome-beta.rb
index 69f934d37..2cbd178e1 100644
--- a/Casks/google-chrome-beta.rb
+++ b/Casks/google-chrome-beta.rb
@@ -2,9 +2,32 @@ cask :v1 => 'google-chrome-beta' do
   version :latest
   sha256 :no_check
 
-  url 'http://dl.google.com/chrome/mac/beta/googlechrome.dmg'
-  homepage 'https://www.google.com/intl/en/chrome/browser/beta.html'
-  license :closed
+  url 'https://dl.google.com/chrome/mac/beta/googlechrome.dmg'
+  homepage 'https://www.google.com/chrome/browser/beta.html?platform=mac&extra=betachannel'
+  license :gratis
+  tags :vendor => 'Google'
 
   app 'Google Chrome.app'
+
+  zap :delete => [
+                  '~/Library/Application Support/Google/Chrome',
+                  '~/Library/Caches/Google/Chrome',
+                  '~/Library/Caches/com.google.Chrome',
+                  '~/Library/Caches/com.google.Chrome.helper.EH',
+                  '~/Library/Caches/com.google.Keystone.Agent',
+                  '~/Library/Caches/com.google.SoftwareUpdate',
+                  '~/Library/Google/GoogleSoftwareUpdate',
+                  '~/Library/Logs/GoogleSoftwareUpdateAgent.log',
+                 ],
+      :rmdir  => [
+                  '~/Library/Caches/Google',
+                  '~/Library/Google',
+                 ]
+
+  caveats <<-EOS.undent
+    The Mac App Store version of 1Password won't work with a Homebrew-Cask-linked Google Chrome. To bypass this limitation, you need to either:
+
+      + Move Google Chrome to your /Applications directory (the app itself, not a symlink).
+      + Install 1Password from outside the Mac App Store (licenses should transfer automatically, but you should contact AgileBits about it).
+  EOS
 end