diff --git a/tools/patcher-configs/moz18-branch-patcher2.cfg b/tools/patcher-configs/moz18-branch-patcher2.cfg
index 6d28d1cb0ad..0e4390c2b45 100644
--- a/tools/patcher-configs/moz18-branch-patcher2.cfg
+++ b/tools/patcher-configs/moz18-branch-patcher2.cfg
@@ -5,25 +5,25 @@
             beta-dir   beta
             channel   beta release
             <complete>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.11-candidates/rc1/firefox-2.0.0.11.%locale%.%platform%.complete.mar
-                betatest-url   http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.11-candidates/rc1/firefox-2.0.0.11.%locale%.%platform%.complete.mar
-                path   firefox/nightly/2.0.0.11-candidates/rc1/firefox-2.0.0.11.%locale%.%platform%.complete.mar
-                url   http://download.mozilla.org/?product=firefox-2.0.0.11-complete&os=%bouncer-platform%&lang=%locale%
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.12-candidates/rc1/firefox-2.0.0.12.%locale%.%platform%.complete.mar
+                betatest-url   http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.12-candidates/rc1/firefox-2.0.0.12.%locale%.%platform%.complete.mar
+                path   firefox/nightly/2.0.0.12-candidates/rc1/firefox-2.0.0.12.%locale%.%platform%.complete.mar
+                url   http://download.mozilla.org/?product=firefox-2.0.0.12-complete&os=%bouncer-platform%&lang=%locale%
             </complete>
-            details   http://%locale%.www.mozilla.com/%locale%/firefox/%version%/releasenotes/
-            from   2.0.0.10
+            details   http://%locale%.www.mozilla.com/%locale%/firefox/2.0.0.12/releasenotes/
+            from   2.0.0.11
             <partial>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.11-candidates/rc1/firefox-2.0.0.10-2.0.0.11.%locale%.%platform%.partial.mar
-                betatest-url   http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.11-candidates/rc1/firefox-2.0.0.10-2.0.0.11.%locale%.%platform%.partial.mar
-                path   firefox/nightly/2.0.0.11-candidates/rc1/firefox-2.0.0.10-2.0.0.11.%locale%.%platform%.partial.mar
-                url   http://download.mozilla.org/?product=firefox-2.0.0.11-partial-2.0.0.10&os=%bouncer-platform%&lang=%locale%
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.12-candidates/rc1/firefox-2.0.0.11-2.0.0.12.%locale%.%platform%.partial.mar
+                betatest-url   http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.12-candidates/rc1/firefox-2.0.0.11-2.0.0.12.%locale%.%platform%.partial.mar
+                path   firefox/nightly/2.0.0.12-candidates/rc1/firefox-2.0.0.11-2.0.0.12.%locale%.%platform%.partial.mar
+                url   http://download.mozilla.org/?product=firefox-2.0.0.12-partial-2.0.0.11&os=%bouncer-platform%&lang=%locale%
             </partial>
             <rc>
                 beta   1
                 betatest   1
             </rc>
             testchannel   betatest releasetest
-            to   2.0.0.11
+            to   2.0.0.12
         </current-update>
         past-update   2.0a1 2.0a2 betatest beta
         past-update   2.0a2 2.0a3 betatest beta
@@ -42,6 +42,7 @@
         past-update   2.0.0.7 2.0.0.8 betatest releasetest beta release
         past-update   2.0.0.8 2.0.0.9 betatest releasetest beta release
         past-update   2.0.0.9 2.0.0.10 betatest releasetest beta release
+        past-update   2.0.0.10 2.0.0.11 betatest releasetest beta release
         <release>
             <2.0>
                 completemarurl   http://stage.mozilla.org/pub/mozilla.org/firefox/releases/2.0/update/%platform%/%locale%/firefox-2.0.complete.mar
@@ -113,6 +114,24 @@
                 schema   1
                 version   2.0.0.11
             </2.0.0.11>
+            <2.0.0.12>
+                completemarurl   http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.12-candidates/rc1/firefox-2.0.0.12.%locale%.%platform%.complete.mar
+                <exceptions>
+                    gu-IN   linux-i686, win32
+                    ja   linux-i686, win32
+                    ja-JP-mac   mac
+                    ka   linux-i686, win32
+                </exceptions>
+                extension-version   2.0.0.12
+                locales   af ar be bg ca cs da de el en-GB en-US es-AR es-ES eu fi fr fy-NL ga-IE gu-IN he hu it ja ja-JP-mac ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sl sv-SE tr uk zh-CN zh-TW
+                <platforms>
+                    linux-i686   2008012820
+                    mac   2008012822
+                    win32   2008012820
+                </platforms>
+                schema   1
+                version   2.0.0.12
+            </2.0.0.12>
             <2.0.0.2>
                 completemarurl   http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.2-candidates/rc5/firefox-2.0.0.2.%locale%.%platform%.complete.mar
                 <exceptions>