diff --git a/mozilla/tools/patcher-configs/moz192-thunderbird-branch-patcher2.cfg b/mozilla/tools/patcher-configs/moz192-thunderbird-branch-patcher2.cfg
index 595ad9062c9..03a302ab11b 100644
--- a/mozilla/tools/patcher-configs/moz192-thunderbird-branch-patcher2.cfg
+++ b/mozilla/tools/patcher-configs/moz192-thunderbird-branch-patcher2.cfg
@@ -6,10 +6,10 @@
             testchannel   betatest releasetest
             channel   beta release
             <partial>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.8-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.7-3.1.8.partial.mar
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.8-candidates/build2/update/%platform%/%locale%/thunderbird-3.1.7-3.1.8.partial.mar
                 url   http://download.mozilla.org/?product=thunderbird-3.1.8-partial-3.1.7&os=%bouncer-platform%&lang=%locale%
-                path   thunderbird/nightly/3.1.8-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.7-3.1.8.partial.mar
-                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.8-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.7-3.1.8.partial.mar
+                path   thunderbird/nightly/3.1.8-candidates/build2/update/%platform%/%locale%/thunderbird-3.1.7-3.1.8.partial.mar
+                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.8-candidates/build2/update/%platform%/%locale%/thunderbird-3.1.7-3.1.8.partial.mar
             </partial>
             details   http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%locale%&platform=%platform%&version=%version%
             force   freebl3.chk
@@ -21,10 +21,10 @@
             from   3.1.7
             beta-dir   beta
             <complete>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.8-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.8.complete.mar
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.8-candidates/build2/update/%platform%/%locale%/thunderbird-3.1.8.complete.mar
                 url   http://download.mozilla.org/?product=thunderbird-3.1.8-complete&os=%bouncer-platform%&lang=%locale%
-                path   thunderbird/nightly/3.1.8-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.8.complete.mar
-                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.8-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.8.complete.mar
+                path   thunderbird/nightly/3.1.8-candidates/build2/update/%platform%/%locale%/thunderbird-3.1.8.complete.mar
+                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.8-candidates/build2/update/%platform%/%locale%/thunderbird-3.1.8.complete.mar
             </complete>
         </current-update>
         past-update   3.1a1 3.1b1 betatest beta
@@ -124,23 +124,6 @@
                 extension-version   3.1.7
                 completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.7-candidates/build3/update/%platform%/%locale%/thunderbird-3.1.7.complete.mar
             </3.1.7>
-            <3.1b1>
-                <exceptions>
-                    ja   linux-i686, win32
-                    ja-JP-mac   mac
-                </exceptions>
-                <platforms>
-                    win32   20100302141414
-                    linux-i686   20100302133342
-                    mac   20100302163140
-                </platforms>
-                prettyVersion   3.1 Beta 1
-                version   3.1b1
-                locales   bg ca cs da de el en-US es-AR es-ES et fi fr id is ja ja-JP-mac lt nl pt-PT ro ru si sk sq sv-SE zh-TW
-                schema   1
-                extension-version   3.1b1
-                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1b1-candidates/build1/update/%platform%/%locale%/lanikai-3.1b1.complete.mar
-            </3.1b1>
             <3.1.1>
                 prettyVersion   3.1.1
                 <platforms>
@@ -158,12 +141,29 @@
                 extension-version   3.1.1
                 completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.1-candidates/build2/update/%platform%/%locale%/thunderbird-3.1.1.complete.mar
             </3.1.1>
+            <3.1b1>
+                <exceptions>
+                    ja   linux-i686, win32
+                    ja-JP-mac   mac
+                </exceptions>
+                <platforms>
+                    win32   20100302141414
+                    linux-i686   20100302133342
+                    mac   20100302163140
+                </platforms>
+                prettyVersion   3.1 Beta 1
+                version   3.1b1
+                locales   bg ca cs da de el en-US es-AR es-ES et fi fr id is ja ja-JP-mac lt nl pt-PT ro ru si sk sq sv-SE zh-TW
+                schema   1
+                extension-version   3.1b1
+                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1b1-candidates/build1/update/%platform%/%locale%/lanikai-3.1b1.complete.mar
+            </3.1b1>
             <3.1.8>
                 prettyVersion   3.1.8
                 <platforms>
-                    linux-i686   20110123093654
-                    win32   20110123093711
-                    mac   20110123093659
+                    linux-i686   20110207145145
+                    win32   20110207144816
+                    mac   20110207145416
                 </platforms>
                 <exceptions>
                     ja   linux-i686, win32
@@ -173,25 +173,8 @@
                 locales   af ar be bg bn-BD 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 ro ru si sk sl sq sr sv-SE tr uk vi zh-CN zh-TW
                 schema   1
                 extension-version   3.1.8
-                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.8-candidates/build1/update/%platform%/%locale%/thunderbird-3.1.8.complete.mar
+                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.8-candidates/build2/update/%platform%/%locale%/thunderbird-3.1.8.complete.mar
             </3.1.8>
-            <3.1b2>
-                <exceptions>
-                    ja   linux-i686, win32
-                    ja-JP-mac   mac
-                </exceptions>
-                <platforms>
-                    win32   20100430130203
-                    linux-i686   20100430125415
-                    mac   20100430155526
-                </platforms>
-                prettyVersion   3.1 Beta 2
-                version   3.1b2
-                locales   ar be ca cs da de el en-GB en-US es-AR es-ES et fi fr ga-IE id is it ja ja-JP-mac lt nb-NO nl pa-IN pl pt-BR pt-PT ru si sk sq sv-SE uk zh-TW
-                schema   1
-                extension-version   3.1b2
-                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1b2-candidates/build2/update/%platform%/%locale%/thunderbird-3.1b2.complete.mar
-            </3.1b2>
             <3.1.5>
                 prettyVersion   3.1.5
                 <platforms>
@@ -209,6 +192,23 @@
                 extension-version   3.1.5
                 completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1.5-candidates/build3/update/%platform%/%locale%/thunderbird-3.1.5.complete.mar
             </3.1.5>
+            <3.1b2>
+                <exceptions>
+                    ja   linux-i686, win32
+                    ja-JP-mac   mac
+                </exceptions>
+                <platforms>
+                    win32   20100430130203
+                    linux-i686   20100430125415
+                    mac   20100430155526
+                </platforms>
+                prettyVersion   3.1 Beta 2
+                version   3.1b2
+                locales   ar be ca cs da de el en-GB en-US es-AR es-ES et fi fr ga-IE id is it ja ja-JP-mac lt nb-NO nl pa-IN pl pt-BR pt-PT ru si sk sq sv-SE uk zh-TW
+                schema   1
+                extension-version   3.1b2
+                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/thunderbird/nightly/3.1b2-candidates/build2/update/%platform%/%locale%/thunderbird-3.1b2.complete.mar
+            </3.1b2>
             <3.1rc2>
                 prettyVersion   3.1 RC 2
                 <platforms>