diff --git a/Casks/android-studio-canary.rb b/Casks/android-studio-canary.rb
index ae7776582..9fb2aac35 100644
--- a/Casks/android-studio-canary.rb
+++ b/Casks/android-studio-canary.rb
@@ -3,16 +3,22 @@ cask :v1 => 'android-studio-canary' do
   sha256 'cc06d31f71a4bbc94e3027846f8293ffe898c77d55eccb3dee1fb073cd1e3d1c'
 
   url "http://dl.google.com/dl/android/studio/ide-zips/#{version}/android-studio-ide-141.2095413-mac.zip"
-  homepage 'http://tools.android.com/download/studio'
+  name 'Android Studio Canary'
+  homepage 'https://sites.google.com/a/android.com/tools/download/studio/canary'
   license :apache
 
   app 'Android Studio.app'
 
   caveats <<-EOS.undent
-    If you have Java 7 or above installed, you may want to use it as Android Studio JDK, for example:
-
-    export STUDIO_JDK=/Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk
-
-    Please take a look at this post: http://tools.android.com/recent/androidstudio1rc3_releasecandidate3released
+    #{token} requires Java. You can install the latest version with
+    brew cask install java
   EOS
+  zap :delete => [
+    '~/Library/Preferences/AndroidStudio*',
+    '~/Library/Preferences/com.google.android.studio.plist',
+    '~/Library/Application Support/AndroidStudio*',
+    '~/Library/Logs/AndroidStudio*',
+    '~/Library/Caches/AndroidStudio*',
+  ],
+  :rmdir => '~/AndroidStudioProjects'
 end