diff --git a/Casks/geotag.rb b/Casks/geotag.rb
index d3d10417e9..0b60076831 100644
--- a/Casks/geotag.rb
+++ b/Casks/geotag.rb
@@ -3,14 +3,24 @@ cask 'geotag' do
     version '2.2'
     sha256 'c5553af3b37903b7e4f402d8c9fbeced63492295c6bdd25987dd70ab367c32e9'
   else
-    version '3.5'
-    sha256 'b8c46486502a90856087de7e637d73c6ce21db62cde2c1483d33e2e3e2da16d3'
+    version '3.5.8'
+    sha256 '08ec271c56e5fda2fe3eee73289f0994084ecc3ce0ebffbc8dac3444f00ad41c'
   end
 
   url "http://www.snafu.org/GeoTag/GeoTag-#{version}.dmg"
+  appcast 'http://www.snafu.org/GeoTag/',
+          :checkpoint => 'dd2955d0beafa2a1ef44d005a32cbe54f4c12a9fdfc3a6a92533f96d01fa2142'
   name 'GeoTag'
   homepage 'http://www.snafu.org/GeoTag/'
   license :cc
 
+  depends_on :formula => 'exiftool'
+
   app 'GeoTag.app'
+
+  zap :delete => [
+                   '~/Library/Caches/org.snafu.GeoTag',
+                   '~/Library/Saved Application State/org.snafu.GeoTag.savedState',
+                 ],
+      :trash  => '~/Library/Preferences/org.snafu.GeoTag.plist'
 end