diff --git a/Casks/thunderbird-beta.rb b/Casks/thunderbird-beta.rb
index b697bb404..b37806d45 100644
--- a/Casks/thunderbird-beta.rb
+++ b/Casks/thunderbird-beta.rb
@@ -2,9 +2,10 @@ cask :v1 => 'thunderbird-beta' do
   version '38.0b4'
   sha256 '07e8d88b0a1c37b9770f24b35e513fd27eefb7d34dca20236499692573739503'
 
-  url "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/#{version}/mac/en-US/Thunderbird%20#{version}.dmg"
+  url "https://download.mozilla.org/?product=thunderbird-#{version}&os=osx&lang=en-US"
   homepage 'https://www.mozilla.org/en-US/thunderbird/all-beta.html'
   license :mpl
+  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-cn.rb b/Casks/thunderbird-cn.rb
index 7d760b436..c7b641056 100644
--- a/Casks/thunderbird-cn.rb
+++ b/Casks/thunderbird-cn.rb
@@ -1,10 +1,11 @@
 cask :v1 => 'thunderbird-cn' do
-  version '31.3.0'
-  sha256 'b7fb163224143dc1cda73c4fed8b5e18758b248e208a01e83fbdc98c9f120c1b'
+  version '31.6.0'
+  sha256 'fbc95c8a169d5a8bf7b998b8017608a8e42a9232ddce7ae2c443c09112c783a9'
 
-  url "ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/#{version}/mac/zh-CN/Thunderbird%20#{version}.dmg"
+  url "https://download.mozilla.org/?product=thunderbird-#{version}&os=osx&lang=zh-CN"
   homepage 'https://www.mozilla.org/zh-CN/thunderbird/'
-  license :oss
+  license :mpl
+  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-fr.rb b/Casks/thunderbird-fr.rb
index 495f0808c..28bfc3f68 100644
--- a/Casks/thunderbird-fr.rb
+++ b/Casks/thunderbird-fr.rb
@@ -1,10 +1,11 @@
 cask :v1 => 'thunderbird-fr' do
-  version '24.6.0'
-  sha256 'cf53ff2727d6699ed3b866794285bfd955af4fe177646455327eca78094a2d38'
+  version '31.6.0'
+  sha256 '241a9175b34f190f5b485326a2c119571b451e0c14e1a7d04af27e49792ab245'
 
-  url "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases/#{version}/mac/fr/Thunderbird%20#{version}.dmg"
+  url "https://download.mozilla.org/?product=thunderbird-#{version}&os=osx&lang=fr"
   homepage 'https://www.mozilla.org/fr/thunderbird/'
-  license :oss
+  license :mpl
+  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-gl.rb b/Casks/thunderbird-gl.rb
index 46257ab25..6e748e2a7 100644
--- a/Casks/thunderbird-gl.rb
+++ b/Casks/thunderbird-gl.rb
@@ -1,10 +1,11 @@
 cask :v1 => 'thunderbird-gl' do
-  version '31.4.0'
-  sha256 '36fe75ceae334fabbff74ed49a30755b87a9e2f1ec6af54551794151bd74021f'
+  version '31.6.0'
+  sha256 'b0cc0e9bef5d62b82fcd37f57d03b852bcaadd9344d8ac1cb09bb6c1eca92a54'
 
   url "https://download.mozilla.org/?product=thunderbird-#{version}&os=osx&lang=gl"
   homepage 'https://www.mozilla.org/gl/thunderbird/'
   license :mpl
+  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-it.rb b/Casks/thunderbird-it.rb
index 0580dcb49..e6b0e49c8 100644
--- a/Casks/thunderbird-it.rb
+++ b/Casks/thunderbird-it.rb
@@ -1,10 +1,11 @@
 cask :v1 => 'thunderbird-it' do
-  version '31.2.0'
-  sha256 '28bacc4d40ddc1d81eacb4b921006737a58fa69732b5afcbe596a4ec5709bc90'
+  version '31.6.0'
+  sha256 '089ac641055e607404a0d78ed12bd237489d504c42c320e6f4cadb756eabf75f'
 
-  url "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases/#{version}/mac/it/Thunderbird%20#{version}.dmg"
+  url "https://download.mozilla.org/?product=thunderbird-#{version}&os=osx&lang=it"
   homepage 'https://www.mozilla.org/it/thunderbird/'
-  license :oss
+  license :mpl
+  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-ja.rb b/Casks/thunderbird-ja.rb
index ee577ca5e..8f2468826 100644
--- a/Casks/thunderbird-ja.rb
+++ b/Casks/thunderbird-ja.rb
@@ -1,10 +1,11 @@
 cask :v1 => 'thunderbird-ja' do
-  version '31.1.1'
-  sha256 'aa5da47afcc4f71e40f86b94c6033d86d707690a80a8610e1a5f9c09a5ca4629'
+  version '31.6.0'
+  sha256 '6b6210481826e5365da88f1460cd0b5a2936aa9b601b5482faecbde34b1fd5c0'
 
   url "https://download.mozilla.org/?product=thunderbird-#{version}&os=osx&lang=ja-JP-mac"
-  homepage 'http://www.mozilla.jp/thunderbird/'
-  license :oss
+  homepage 'https://www.mozilla.jp/thunderbird/'
+  license :mpl
+  tags :vendor => 'Mozilla'
 
   app 'Thunderbird.app'
 end
diff --git a/Casks/thunderbird-pt.rb b/Casks/thunderbird-pt.rb
index afa899df4..acbba4b4f 100644
--- a/Casks/thunderbird-pt.rb
+++ b/Casks/thunderbird-pt.rb
@@ -1,6 +1,6 @@
 cask :v1 => 'thunderbird-pt' do
-  version '31.4.0'
-  sha256 '36fe75ceae334fabbff74ed49a30755b87a9e2f1ec6af54551794151bd74021f'
+  version '31.6.0'
+  sha256 'c1ed4526759c1e88b000b8d7594919fba257db0c09a6ed3a80ae0f5a70e95d7a'
 
   url "https://download.mozilla.org/?product=thunderbird-#{version}&os=osx&lang=pt-BR"
   name 'Mozilla Thunderbird'