diff --git a/mozilla/tools/patcher-configs/mozRelease-thunderbird-branch-patcher2.cfg b/mozilla/tools/patcher-configs/mozRelease-thunderbird-branch-patcher2.cfg
index 2961810efcc..fffc9694a2c 100644
--- a/mozilla/tools/patcher-configs/mozRelease-thunderbird-branch-patcher2.cfg
+++ b/mozilla/tools/patcher-configs/mozRelease-thunderbird-branch-patcher2.cfg
@@ -1,29 +1,30 @@
 <app>
     <Thunderbird>
         <current-update>
-            beta-dir   beta
-            channel   release
-            details   http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%
-            from   6.0.1
             testchannel   betatest releasetest
-            to   6.0.2
-            <partial>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/6.0.2-candidates/build2/update/%platform%/%locale%/thunderbird-6.0.1-6.0.2.1.partial.mar
-                url   http://download.mozilla.org/?product=thunderbird-6.0.2-partial-6.0.1&os=%bouncer-platform%&lang=%locale%
-                path   thunderbird/nightly/6.0.2-candidates/build2/update/%platform%/%locale%/thunderbird-6.0.1-6.0.2.1.partial.mar
-                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/6.0.2-candidates/build2/update/%platform%/%locale%/thunderbird-6.0.1-6.0.2.1.partial.mar
-            </partial>
             <rc>
             </rc>
+            channel   release
+            details   http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%
+            <partial>
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/7.0-candidates/build1/update/%platform%/%locale%/thunderbird-6.0.2-7.0.1.partial.mar
+                url   http://download.mozilla.org/?product=thunderbird-7.0-partial-6.0.2&os=%bouncer-platform%&lang=%locale%
+                path   thunderbird/nightly/7.0-candidates/build1/update/%platform%/%locale%/thunderbird-6.0.2-7.0.1.partial.mar
+                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/7.0-candidates/build1/update/%platform%/%locale%/thunderbird-6.0.2-7.0.1.partial.mar
+            </partial>
+            to   7.0
+            from   6.0.2
+            beta-dir   beta
             <complete>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/6.0.2-candidates/build2/update/%platform%/%locale%/thunderbird-6.0.2.1.complete.mar
-                url   http://download.mozilla.org/?product=thunderbird-6.0.2-complete&os=%bouncer-platform%&lang=%locale%
-                path   thunderbird/nightly/6.0.2-candidates/build2/update/%platform%/%locale%/thunderbird-6.0.2.1.complete.mar
-                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/6.0.2-candidates/build2/update/%platform%/%locale%/thunderbird-6.0.2.1.complete.mar
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/7.0-candidates/build1/update/%platform%/%locale%/thunderbird-7.0.1.complete.mar
+                url   http://download.mozilla.org/?product=thunderbird-7.0-complete&os=%bouncer-platform%&lang=%locale%
+                path   thunderbird/nightly/7.0-candidates/build1/update/%platform%/%locale%/thunderbird-7.0.1.complete.mar
+                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/7.0-candidates/build1/update/%platform%/%locale%/thunderbird-7.0.1.complete.mar
             </complete>
         </current-update>
         past-update   5.0 6.0 betatest releasetest release
         past-update   6.0 6.0.1 betatest releasetest release
+        past-update   6.0.1 6.0.2 betatest releasetest release
         <release>
             <5.0>
                 prettyVersion   5.0
@@ -61,6 +62,24 @@
                 extension-version   6.0
                 completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/6.0-candidates/build2/update/%platform%/%locale%/thunderbird-6.0.complete.mar
             </6.0>
+            <7.0>
+                prettyVersion   7.0
+                <platforms>
+                    linux-i686   20110922212718
+                    win32   20110922212730
+                    linux-x86_64   20110922212710
+                    mac   20110922212709
+                </platforms>
+                <exceptions>
+                    ja   linux-i686, linux-x86_64, win32
+                    ja-JP-mac   mac
+                </exceptions>
+                version   7.0
+                locales   ar be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hu id is it ja ja-JP-mac ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sv-SE ta-LK tr uk vi zh-CN zh-TW
+                schema   1
+                extension-version   7.0
+                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/7.0-candidates/build1/update/%platform%/%locale%/thunderbird-7.0.complete.mar
+            </7.0>
             <6.0.2>
                 prettyVersion   6.0.2
                 <platforms>