diff --git a/tools/patcher-configs/moz18-branch-patcher2.cfg b/tools/patcher-configs/moz18-branch-patcher2.cfg
index 47fd67d008a..61d0cca5864 100644
--- a/tools/patcher-configs/moz18-branch-patcher2.cfg
+++ b/tools/patcher-configs/moz18-branch-patcher2.cfg
@@ -455,18 +455,18 @@
             beta-dir   beta
             channel   beta release
             <complete>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/2.0.0.14-candidates/rc1/thunderbird-2.0.0.14.%locale%.%platform%.complete.mar
-                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/2.0.0.14-candidates/rc1/thunderbird-2.0.0.14.%locale%.%platform%.complete.mar
-                path   thunderbird/nightly/2.0.0.14-candidates/rc1/thunderbird-2.0.0.14.%locale%.%platform%.complete.mar
-                url   http://download.mozilla.org/?product=thunderbird-2.0.0.14-complete&os=%bouncer-platform%&lang=%locale%
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/2.0.0.16-candidates/build1/thunderbird-2.0.0.16.%locale%.%platform%.complete.mar
+                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/2.0.0.16-candidates/build1/thunderbird-2.0.0.16.%locale%.%platform%.complete.mar
+                path   thunderbird/nightly/2.0.0.16-candidates/build1/thunderbird-2.0.0.16.%locale%.%platform%.complete.mar
+                url   http://download.mozilla.org/?product=thunderbird-2.0.0.16-complete&os=%bouncer-platform%&lang=%locale%
             </complete>
-            details   http://%locale%.www.mozilla.com/%locale%/thunderbird/2.0.0.14/releasenotes/
-            from   2.0.0.12
+            details   http://%locale%.www.mozilla.com/%locale%/thunderbird/2.0.0.16/releasenotes/
+            from   2.0.0.14
             <partial>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/2.0.0.14-candidates/rc1/thunderbird-2.0.0.12-2.0.0.14.%locale%.%platform%.partial.mar
-                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/2.0.0.14-candidates/rc1/thunderbird-2.0.0.12-2.0.0.14.%locale%.%platform%.partial.mar
-                path   thunderbird/nightly/2.0.0.14-candidates/rc1/thunderbird-2.0.0.12-2.0.0.14.%locale%.%platform%.partial.mar
-                url   http://download.mozilla.org/?product=thunderbird-2.0.0.14-partial-2.0.0.12&os=%bouncer-platform%&lang=%locale%
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/2.0.0.16-candidates/build1/thunderbird-2.0.0.14-2.0.0.16.%locale%.%platform%.partial.mar
+                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/2.0.0.16-candidates/build1/thunderbird-2.0.0.14-2.0.0.16.%locale%.%platform%.partial.mar
+                path   thunderbird/nightly/2.0.0.16-candidates/build1/thunderbird-2.0.0.14-2.0.0.16.%locale%.%platform%.partial.mar
+                url   http://download.mozilla.org/?product=thunderbird-2.0.0.16-partial-2.0.0.14&os=%bouncer-platform%&lang=%locale%
             </partial>
             <rc>
                 DisableCompleteJump   1
@@ -474,7 +474,7 @@
                 betatest   1
             </rc>
             testchannel   betatest releasetest
-            to   2.0.0.14
+            to   2.0.0.16
         </current-update>
         past-update   2.0b1 2.0b2 betatest beta
         past-update   2.0b2 2.0.0.0 betatest beta
@@ -483,6 +483,7 @@
         past-update   2.0.0.5 2.0.0.6 betatest releasetest beta release
         past-update   2.0.0.6 2.0.0.9 betatest releasetest beta release
         past-update   2.0.0.9 2.0.0.12 betatest releasetest beta release
+        past-update   2.0.0.12 2.0.0.14 betatest releasetest beta release
         <release>
             <2.0.0.0>
                 completemarurl   http://stage.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.0/update/%platform%/%locale%/thunderbird-2.0.0.0.complete.mar
@@ -535,6 +536,24 @@
                 schema   1
                 version   2.0.0.14
             </2.0.0.14>
+            <2.0.0.16>
+                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/2.0.0.16-candidates/build1/thunderbird-2.0.0.16.%locale%.%platform%.complete.mar
+                <exceptions>
+                    he   linux-i686, win32
+                    ja   linux-i686, win32
+                    ja-JP-mac   mac, macppc
+                </exceptions>
+                extension-version   2.0.0.16
+                locales   af be bg ca cs da de el en-GB en-US es-AR es-ES eu fi fr ga-IE he hu it ja ja-JP-mac ko lt mk nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr uk zh-CN zh-TW
+                <platforms>
+                    linux-i686   2008070711
+                    mac   2008070710
+                    win32   2008070808
+                </platforms>
+                prettyVersion   2.0.0.16
+                schema   1
+                version   2.0.0.16
+            </2.0.0.16>
             <2.0.0.4>
                 completemarurl   http://stage.mozilla.org/pub/mozilla.org/thunderbird/nightly/2.0.0.4-candidates/rc1/thunderbird-2.0.0.4.%locale%.%platform%.complete.mar
                 <exceptions>