diff --git a/Casks/adobe-master-collection-cs6.rb b/Casks/adobe-cs6-master-collection.rb
similarity index 69%
rename from Casks/adobe-master-collection-cs6.rb
rename to Casks/adobe-cs6-master-collection.rb
index 5e97ab530..37e15b655 100644
--- a/Casks/adobe-master-collection-cs6.rb
+++ b/Casks/adobe-cs6-master-collection.rb
@@ -1,6 +1,6 @@
-cask 'adobe-master-collection-cs6' do
-  version :latest
-  sha256 :no_check
+cask 'adobe-cs6-master-collection' do
+  version 'CS6'
+  sha256 '98d55be1c0a641db6d3a0b5eb902c7f3f6da3742b47d8587e241e6fdae8246b4'
 
   # This Cask only works for Adobe dmgs containing the deploy folder,
   # i.e. the Adobe Collections, not the single Product Installers!
@@ -8,7 +8,7 @@ cask 'adobe-master-collection-cs6' do
   # For correct download URL see links provided at
   # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html
 
-  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS16.dmg',
+  url "http://trials2.adobe.com/AdobeProducts/STAM/#{version}/osx10/MasterCollection_#{version}_LS4.dmg",
       user_agent: :fake,
       cookies:    { 'MM_TRIALS' => '1234' }
   name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
@@ -20,8 +20,22 @@ cask 'adobe-master-collection-cs6' do
   # and https://github.com/caskroom/homebrew-versions/pull/296
 
   preflight do
+    language = case MacOS.language
+               when %r{^de} then 'de_DE'
+               when 'en-GB' then 'en_GB'
+               when %r{^es} then 'es_ES'
+               when %r{^fr} then 'fr_FR'
+               when %r{^it} then 'it_IT'
+               when %r{^ja} then 'ja_JP'
+               when %r{^nl} then 'nl_NL'
+               else
+                 'en_US'
+               end
+
     system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/install-en_US.xml"
+    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/install-#{language}.xml"
+
+    FileUtils.cp "#{staged_path}/Adobe CS6 Master Collection/deploy/uninstall-en_US.xml", "#{staged_path}/uninstall.xml"
   end
 
   uninstall_preflight do
diff --git a/Casks/adobe-master-collection-cs6-de.rb b/Casks/adobe-master-collection-cs6-de.rb
deleted file mode 100644
index 4d331fcdf..000000000
--- a/Casks/adobe-master-collection-cs6-de.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-cask 'adobe-master-collection-cs6-de' do
-  version :latest
-  sha256 :no_check
-
-  # This Cask only works for Adobe dmgs containing the deploy folder,
-  # i.e. the Adobe Collections, not the single Product Installers!
-
-  # For correct download URL see links provided at
-  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html
-
-  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg',
-      user_agent: :fake,
-      cookies:    { 'MM_TRIALS' => '1234' }
-  name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
-  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
-  license :commercial
-
-  # staged_path not available in Installer/Uninstall Stanza, workaround by nesting with preflight/postflight
-  # see https://github.com/caskroom/homebrew-cask/pull/8887
-  # and https://github.com/caskroom/homebrew-versions/pull/296
-
-  preflight do
-    system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/install-de_DE.xml"
-  end
-
-  uninstall_preflight do
-    system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/uninstall-de_DE.xml"
-  end
-
-  caveats 'Installation or Uninstallation may fail with Exit Code 19 (Conflicting Processes running) if Browsers, Safari Notification Service or SIMBL Services (e.g. Flashlight) are running or Adobe Creative Cloud or any other Adobe Products are already installed. See Logs in /Library/Logs/Adobe/Installers if Installation or Uninstallation fails, to identifify the conflicting processes.'
-end
diff --git a/Casks/adobe-master-collection-cs6-es.rb b/Casks/adobe-master-collection-cs6-es.rb
deleted file mode 100644
index c527081e8..000000000
--- a/Casks/adobe-master-collection-cs6-es.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-cask 'adobe-master-collection-cs6-es' do
-  version :latest
-  sha256 :no_check
-
-  # This Cask only works for Adobe dmgs containing the deploy folder,
-  # i.e. the Adobe Collections, not the single Product Installers!
-
-  # For correct download URL see links provided at
-  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html
-
-  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg',
-      user_agent: :fake,
-      cookies:    { 'MM_TRIALS' => '1234' }
-  name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
-  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
-  license :commercial
-
-  # staged_path not available in Installer/Uninstall Stanza, workaround by nesting with preflight/postflight
-  # see https://github.com/caskroom/homebrew-cask/pull/8887
-  # and https://github.com/caskroom/homebrew-versions/pull/296
-
-  preflight do
-    system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/install-es_ES.xml"
-  end
-
-  uninstall_preflight do
-    system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/uninstall-es_ES.xml"
-  end
-
-  caveats 'Installation or Uninstallation may fail with Exit Code 19 (Conflicting Processes running) if Browsers, Safari Notification Service or SIMBL Services (e.g. Flashlight) are running or Adobe Creative Cloud or any other Adobe Products are already installed. See Logs in /Library/Logs/Adobe/Installers if Installation or Uninstallation fails, to identifify the conflicting processes.'
-end
diff --git a/Casks/adobe-master-collection-cs6-fr.rb b/Casks/adobe-master-collection-cs6-fr.rb
deleted file mode 100644
index c6ba9cee8..000000000
--- a/Casks/adobe-master-collection-cs6-fr.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-cask 'adobe-master-collection-cs6-fr' do
-  version :latest
-  sha256 :no_check
-
-  # This Cask only works for Adobe dmgs containing the deploy folder,
-  # i.e. the Adobe Collections, not the single Product Installers!
-
-  # For correct download URL see links provided at
-  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html
-
-  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg',
-      user_agent: :fake,
-      cookies:    { 'MM_TRIALS' => '1234' }
-  name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
-  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
-  license :commercial
-
-  # staged_path not available in Installer/Uninstall Stanza, workaround by nesting with preflight/postflight
-  # see https://github.com/caskroom/homebrew-cask/pull/8887
-  # and https://github.com/caskroom/homebrew-versions/pull/296
-
-  preflight do
-    system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/install-fr_FR.xml"
-  end
-
-  uninstall_preflight do
-    system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/uninstall-fr_FR.xml"
-  end
-
-  caveats 'Installation or Uninstallation may fail with Exit Code 19 (Conflicting Processes running) if Browsers, Safari Notification Service or SIMBL Services (e.g. Flashlight) are running or Adobe Creative Cloud or any other Adobe Products are already installed. See Logs in /Library/Logs/Adobe/Installers if Installation or Uninstallation fails, to identifify the conflicting processes.'
-end
diff --git a/Casks/adobe-master-collection-cs6-it.rb b/Casks/adobe-master-collection-cs6-it.rb
deleted file mode 100644
index 7bbf08fab..000000000
--- a/Casks/adobe-master-collection-cs6-it.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-cask 'adobe-master-collection-cs6-it' do
-  version :latest
-  sha256 :no_check
-
-  # This Cask only works for Adobe dmgs containing the deploy folder,
-  # i.e. the Adobe Collections, not the single Product Installers!
-
-  # For correct download URL see links provided at
-  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html
-
-  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg',
-      user_agent: :fake,
-      cookies:    { 'MM_TRIALS' => '1234' }
-  name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
-  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
-  license :commercial
-
-  # staged_path not available in Installer/Uninstall Stanza, workaround by nesting with preflight/postflight
-  # see https://github.com/caskroom/homebrew-cask/pull/8887
-  # and https://github.com/caskroom/homebrew-versions/pull/296
-
-  preflight do
-    system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/install-it_IT.xml"
-  end
-
-  uninstall_preflight do
-    system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/uninstall-it_IT.xml"
-  end
-
-  caveats 'Installation or Uninstallation may fail with Exit Code 19 (Conflicting Processes running) if Browsers, Safari Notification Service or SIMBL Services (e.g. Flashlight) are running or Adobe Creative Cloud or any other Adobe Products are already installed. See Logs in /Library/Logs/Adobe/Installers if Installation or Uninstallation fails, to identifify the conflicting processes.'
-end
diff --git a/Casks/adobe-master-collection-cs6-ja.rb b/Casks/adobe-master-collection-cs6-ja.rb
deleted file mode 100644
index eda8d37dd..000000000
--- a/Casks/adobe-master-collection-cs6-ja.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-cask 'adobe-master-collection-cs6-ja' do
-  version :latest
-  sha256 :no_check
-
-  # This Cask only works for Adobe dmgs containing the deploy folder,
-  # i.e. the Adobe Collections, not the single Product Installers!
-
-  # For correct download URL see links provided at
-  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html
-
-  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS16.dmg',
-      user_agent: :fake,
-      cookies:    { 'MM_TRIALS' => '1234' }
-  name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
-  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
-  license :commercial
-
-  # staged_path not available in Installer/Uninstall Stanza, workaround by nesting with preflight/postflight
-  # see https://github.com/caskroom/homebrew-cask/pull/8887
-  # and https://github.com/caskroom/homebrew-versions/pull/296
-
-  preflight do
-    system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/install-ja_JP.xml"
-  end
-
-  uninstall_preflight do
-    system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/uninstall-ja_JP.xml"
-  end
-
-  caveats 'Installation or Uninstallation may fail with Exit Code 19 (Conflicting Processes running) if Browsers, Safari Notification Service or SIMBL Services (e.g. Flashlight) are running or Adobe Creative Cloud or any other Adobe Products are already installed. See Logs in /Library/Logs/Adobe/Installers if Installation or Uninstallation fails, to identifify the conflicting processes.'
-end
diff --git a/Casks/adobe-master-collection-cs6-nl.rb b/Casks/adobe-master-collection-cs6-nl.rb
deleted file mode 100644
index 85ff6e079..000000000
--- a/Casks/adobe-master-collection-cs6-nl.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-cask 'adobe-master-collection-cs6-nl' do
-  version :latest
-  sha256 :no_check
-
-  # This Cask only works for Adobe dmgs containing the deploy folder,
-  # i.e. the Adobe Collections, not the single Product Installers!
-
-  # For correct download URL see links provided at
-  # https://helpx.adobe.com/x-productkb/policy-pricing/cs6-product-downloads.html
-
-  url 'http://trials2.adobe.com/AdobeProducts/STAM/CS6/osx10/MasterCollection_CS6_LS4.dmg',
-      user_agent: :fake,
-      cookies:    { 'MM_TRIALS' => '1234' }
-  name 'Adobe CS6 Master Collection' # name must exactly match directory in dmg!
-  homepage 'https://www.adobe.com/mena_en/products/creativesuite.html'
-  license :commercial
-
-  # staged_path not available in Installer/Uninstall Stanza, workaround by nesting with preflight/postflight
-  # see https://github.com/caskroom/homebrew-cask/pull/8887
-  # and https://github.com/caskroom/homebrew-versions/pull/296
-
-  preflight do
-    system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/install-nl_NL.xml"
-  end
-
-  uninstall_preflight do
-    system '/usr/bin/killall', '-kill', 'SafariNotificationAgent'
-    system '/usr/bin/sudo', '-E', '--', "#{staged_path}/Adobe CS6 Master Collection/Install.app/Contents/MacOS/Install", '--mode=silent', "--deploymentFile=#{staged_path}/Adobe CS6 Master Collection/deploy/uninstall-nl_NL.xml"
-  end
-
-  caveats 'Installation or Uninstallation may fail with Exit Code 19 (Conflicting Processes running) if Browsers, Safari Notification Service or SIMBL Services (e.g. Flashlight) are running or Adobe Creative Cloud or any other Adobe Products are already installed. See Logs in /Library/Logs/Adobe/Installers if Installation or Uninstallation fails, to identifify the conflicting processes.'
-end