diff --git a/mozilla/tools/patcher-configs/moz192-branch-patcher2.cfg b/mozilla/tools/patcher-configs/moz192-branch-patcher2.cfg
index 79ed1f8ae9e..c037656aaa1 100644
--- a/mozilla/tools/patcher-configs/moz192-branch-patcher2.cfg
+++ b/mozilla/tools/patcher-configs/moz192-branch-patcher2.cfg
@@ -4,26 +4,26 @@
             beta-dir   beta
             channel   beta release
             <complete>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.6.20-candidates/build1/update/%platform%/%locale%/firefox-3.6.20.complete.mar
-                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.6.20-candidates/build1/update/%platform%/%locale%/firefox-3.6.20.complete.mar
-                path   firefox/nightly/3.6.20-candidates/build1/update/%platform%/%locale%/firefox-3.6.20.complete.mar
-                url   http://download.mozilla.org/?product=firefox-3.6.20-complete&os=%bouncer-platform%&lang=%locale%
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.6.21-candidates/build1/update/%platform%/%locale%/firefox-3.6.21.complete.mar
+                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.6.21-candidates/build1/update/%platform%/%locale%/firefox-3.6.21.complete.mar
+                path   firefox/nightly/3.6.21-candidates/build1/update/%platform%/%locale%/firefox-3.6.21.complete.mar
+                url   http://download.mozilla.org/?product=firefox-3.6.21-complete&os=%bouncer-platform%&lang=%locale%
             </complete>
-            details   https://www.mozilla.com/%locale%/firefox/3.6.20/releasenotes/
+            details   https://www.mozilla.com/%locale%/firefox/3.6.21/releasenotes/
             force   freebl3.chk
             force   softokn3.chk
             force   nssdbm3.chk
-            from   3.6.19
+            from   3.6.20
             <partial>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.6.20-candidates/build1/update/%platform%/%locale%/firefox-3.6.19-3.6.20.partial.mar
-                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.6.20-candidates/build1/update/%platform%/%locale%/firefox-3.6.19-3.6.20.partial.mar
-                path   firefox/nightly/3.6.20-candidates/build1/update/%platform%/%locale%/firefox-3.6.19-3.6.20.partial.mar
-                url   http://download.mozilla.org/?product=firefox-3.6.20-partial-3.6.19&os=%bouncer-platform%&lang=%locale%
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.6.21-candidates/build1/update/%platform%/%locale%/firefox-3.6.20-3.6.21.partial.mar
+                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.6.21-candidates/build1/update/%platform%/%locale%/firefox-3.6.20-3.6.21.partial.mar
+                path   firefox/nightly/3.6.21-candidates/build1/update/%platform%/%locale%/firefox-3.6.20-3.6.21.partial.mar
+                url   http://download.mozilla.org/?product=firefox-3.6.21-partial-3.6.20&os=%bouncer-platform%&lang=%locale%
             </partial>
             <rc>
             </rc>
             testchannel   betatest releasetest
-            to   3.6.20
+            to   3.6.21
         </current-update>
         past-update   3.6a1 3.6b1 betatest releasetest beta
         past-update   3.6b1 3.6b2 betatest releasetest beta
@@ -49,6 +49,7 @@
         past-update   3.6.16 3.6.17 betatest releasetest beta release
         past-update   3.6.17 3.6.18 betatest releasetest beta release
         past-update   3.6.18 3.6.19 betatest releasetest beta release
+        past-update   3.6.19 3.6.20 betatest releasetest beta release
         <release>
             <3.6.10>
                 completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.6.10-candidates/build1/update/%platform%/%locale%/firefox-3.6.10.complete.mar
@@ -270,6 +271,23 @@
                 schema   1
                 version   3.6.20
             </3.6.20>
+            <3.6.21>
+                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.6.21-candidates/build1/update/%platform%/%locale%/firefox-3.6.21.complete.mar
+                <exceptions>
+                    ja   linux-i686, win32
+                    ja-JP-mac   mac
+                </exceptions>
+                extension-version   3.6.21
+                locales   af ar as ast be bg bn-BD bn-IN ca cs cy da de el en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu id is it ja ja-JP-mac ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW
+                <platforms>
+                    linux-i686   20110830092825
+                    mac   20110830092825
+                    win32   20110830092825
+                </platforms>
+                prettyVersion   3.6.21
+                schema   1
+                version   3.6.21
+            </3.6.21>
             <3.6.3>
                 completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.6.3-candidates/build1/update/%platform%/%locale%/firefox-3.6.3.complete.mar
                 <exceptions>