diff --git a/Casks/xquartz-beta.rb b/Casks/xquartz-beta.rb
index ce3acefa6..331766338 100644
--- a/Casks/xquartz-beta.rb
+++ b/Casks/xquartz-beta.rb
@@ -25,18 +25,30 @@ cask 'xquartz-beta' do
   end
 
   uninstall quit:      'org.macosforge.xquartz.X11',
-            launchctl: 'org.macosforge.xquartz.*',
+            launchctl: [
+                         'org.macosforge.xquartz.startx',
+                         'org.macosforge.xquartz.privileged_startx',
+                       ],
             pkgutil:   'org.macosforge.xquartz.pkg',
-            delete:    '/opt/X11/'
-
-  zap       delete: [
-                      '~/Library/Caches/org.macosforge.xquartz.X11',
-                      '~/Library/Logs/X11',
-                      '~/Library/Logs/X11.org.macosforge.xquartz.log',
-                      '~/Library/Logs/X11.org.macosforge.xquartz.log.old',
-                      '~/Library/Preferences/org.macosforge.xquartz.X11.plist',
-                      '~/Library/Saved Application State/org.macosforge.xquartz.X11.savedState',
-                      '~/.Xauthority',
-                    ],
-            rmdir:  '~/.fonts'
+            delete:    [
+                         '/opt/X11/',
+                         '/private/etc/manpaths.d/40-XQuartz',
+                         '/private/etc/paths.d/40-XQuartz',
+                       ]
+
+  zap delete: [
+                '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/org.macosforge.xquartz.x11.sfl',
+                '~/Library/Caches/org.macosforge.xquartz.X11',
+                '~/Library/Cookies/org.macosforge.xquartz.X11.binarycookies',
+                '~/Library/Logs/X11',
+                '~/Library/Logs/X11.org.macosforge.xquartz.log',
+                '~/Library/Logs/X11.org.macosforge.xquartz.log.old',
+                '~/Library/Saved Application State/org.macosforge.xquartz.X11.savedState',
+              ],
+      trash:  [
+                '~/Library/Application Support/XQuartz',
+                '~/Library/Preferences/org.macosforge.xquartz.X11.plist',
+                '~/.Xauthority',
+              ],
+      rmdir:  '~/.fonts'
 end