diff --git a/Casks/xquartz-beta.rb b/Casks/xquartz-beta.rb
new file mode 100644
index 000000000..102295b2d
--- /dev/null
+++ b/Casks/xquartz-beta.rb
@@ -0,0 +1,41 @@
+cask :v1 => 'xquartz-beta' do
+  version '2.7.8_beta3'
+  sha256 'b644281f92fd501b6fce31c2855435219319c86965b1def2172e56d832b31a39'
+
+  url "https://xquartz.macosforge.org/downloads/SL/XQuartz-#{version}.dmg"
+  appcast 'http://xquartz-dl.macosforge.org/sparkle/beta.xml',
+          :sha256 => '9792f0d6abd547e523f6ca33c4dd3847134bc3d46d77ac91b93fe932d6123568'
+  name 'XQuartz'
+  homepage 'http://xquartz.macosforge.org/'
+  license :oss
+
+  pkg 'XQuartz.pkg'
+
+  postflight do
+    Pathname.new(File.expand_path('~')).join('Library', 'Logs').mkpath
+
+    # Set default path to X11 to avoid the need of manual setup
+    system '/usr/bin/defaults', 'write', 'com.apple.applescript', 'ApplicationMap', '-dict-add', 'X11', 'file://localhost/Applications/Utilities/XQuartz.app/'
+
+    # Load & start XServer to avoid the need of relogin
+    system '/bin/launchctl', 'load', '/Library/LaunchAgents/org.macosforge.xquartz.startx.plist'
+
+    # Set automatic Updates for Beta Versions
+    system 'defaults', 'write', 'org.macosforge.xquartz.X11', 'SUFeedURL', 'http://xquartz.macosforge.org/downloads/sparkle/beta.xml'
+  end
+
+  uninstall :quit => 'org.macosforge.xquartz.X11',
+            :launchctl => 'org.macosforge.xquartz.*',
+            :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'
+end