--- a/mozilla/l10n-changesets_thunderbird-beta
+++ b/mozilla/l10n-changesets_thunderbird-beta
@@ -1,58 +1,58 @@
-ar f2273f905147
+ar 2ce7447870d8
 ast a6e53c602b31
 be b4c9f7da6ac6
 bg bd5c4d46e092
 bn-BD c4ae76a06caa
-br fae07a5f5f68
+br ae5e0cfbd4de
 ca 79674121b6a7
-cs bd7714c93067
-cy 3682f66168f1
-da 322bf0c0f168
-de 14b510c58c93
-dsb 0fee6595b3d2
+cs 71b6de43138d
+cy e50b578fa207
+da d0127d28f393
+de 5d9b3b720d21
+dsb b5c02b89be38
 el 213eb620afd4
-en-GB 7757a36df513
-es-AR 8674d98b9622
-es-ES 66241168ad53
-et 4db328a2baca
+en-GB dc7b99a71780
+es-AR 86a1a98fd56d
+es-ES b420d7d6de79
+et f4959a913da9
 eu 291f088aa2da
-fi 1f33f2cde43c
+fi 7a6ed72d8791
 fr fdbb92070247
-fy-NL 60bd7ed0023e
-ga-IE 1ca6dc8c74a2
-gd 2bd92d721cd9
+fy-NL 91738cc3df18
+ga-IE 7ccaf70cfb87
+gd 2beae90125ef
 gl 020204eec53e
-he ca4d4660d2f9
-hr da26144f162f
-hsb c83804b221af
-hu d03e347af96e
-hy-AM 4870638df7b1
+he 83b7c3e8d2df
+hr d6e3038e1cef
+hsb 1813358aba06
+hu ad19534f24f1
+hy-AM c37f86169bba
 id a796af1ad16e
-is 8b5703969380
-it 0ff2c7279e21
-ja 1a0b282d9350
-ja-JP-mac 5074d44dbf01
-ko 563121b0b29d
-lt b38121bd34c3
+is 0a26ebfdd6f8
+it 8180d02e8430
+ja eecea95c4e58
+ja-JP-mac b8a8d78faad1
+ko 18ab60edc9f6
+lt 2a0055a48075
 nb-NO cd8316ad9001
-nl e9500d00251b
+nl 6d1a34cf13d7
 nn-NO a514e7e5502a
 pa-IN 1579a219f210
-pl 354aaeca4d02
-pt-BR e76cf84c4b23
-pt-PT 6022f4b1a67a
+pl 69a1bca8012e
+pt-BR 71dd5dd2ccfb
+pt-PT f3452d4f8835
 rm c34206f3af15
-ro 578f74c6bbb8
-ru 5aec6715d760
+ro 94bd4a92604b
+ru e089b6a78a8e
 si 8922c6107b20
-sk b626d64c9945
-sl 42cda593c1b9
+sk d20ae6842446
+sl 7c441d527be9
 sq 2ff44efdaec4
 sr 8a6205ac3dd5
-sv-SE cb8c09351226
+sv-SE 4ca1236f1015
 ta-LK 70286dc65519
 tr bf1ec72502fb
-uk bcf6f048ff62
+uk cfb385bbe1a9
 vi 84a40c2f0cd6
-zh-CN b67602d9ea30
-zh-TW fa9a7e219676
\ No newline at end of file
+zh-CN 2a1431d08f67
+zh-TW 57e58c5ddd5b
\ No newline at end of file

--- a/mozilla/release-thunderbird-comm-beta.py
+++ b/mozilla/release-thunderbird-comm-beta.py
@@ -17,64 +17,58 @@ releaseConfig['messagePrefix']       = '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'thunderbird'
 releaseConfig['stage_product']       = 'thunderbird'
 releaseConfig['appName']             = 'mail'
 releaseConfig['mozilla_srcdir']      = 'mozilla'
 #  Current version info
-releaseConfig['version']             = '38.0b6'
-releaseConfig['appVersion']          = '38.0'
+releaseConfig['version']             = '40.0b1'
+releaseConfig['appVersion']          = '40.0'
 releaseConfig['milestone']           = releaseConfig['appVersion']
-releaseConfig['buildNumber']         = 2
-releaseConfig['baseTag']             = 'THUNDERBIRD_38_0b6'
+releaseConfig['buildNumber']         = 1
+releaseConfig['baseTag']             = 'THUNDERBIRD_40_0b1'
 releaseConfig['partialUpdates']      = {
 
-    '38.0b3': {
+    '38.0b6': {
         'appVersion': '38.0',
         'buildNumber': 2,
-        'baseTag': 'THUNDERBIRD_38_0b3',
+        'baseTag': 'THUNDERBIRD_38_0b6',
     },
 
     '38.0b5': {
         'appVersion': '38.0',
         'buildNumber': 1,
         'baseTag': 'THUNDERBIRD_38_0b5',
     },
 
-    '38.0b4': {
-        'appVersion': '38.0',
-        'buildNumber': 5,
-        'baseTag': 'THUNDERBIRD_38_0b4',
-    },
-
 }
 #  Next (nightly) version info
 releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
 releaseConfig['nextMilestone']       = releaseConfig['milestone']
 #  Repository configuration, for tagging
 releaseConfig['sourceRepositories']  = {
     'comm': {
         'name': 'comm-beta',
         'path': 'releases/comm-beta',
-        'revision': 'THUNDERBIRD_38_VERBRANCH',
-        'relbranch': 'THUNDERBIRD_38_VERBRANCH',
+        'revision': '3a6adf92dcac',
+        'relbranch': None,
         'bumpFiles': {
             'mail/config/version.txt': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
         }
     },
     'mozilla': {
-        'name': 'mozilla-release',
-        'path': 'releases/mozilla-release',
-        'revision': 'THUNDERBIRD_38_VERBRANCH',
-        'relbranch': 'THUNDERBIRD_38_VERBRANCH',
+        'name': 'mozilla-beta',
+        'path': 'releases/mozilla-beta',
+        'revision': '5e733820ad95',
+        'relbranch': None,
         'bumpFiles': {
             'config/milestone.txt': {
                 'version': releaseConfig['milestone'],
                 'nextVersion': releaseConfig['nextMilestone']
             },
         }
     }
 }