diff --git a/mozilla/tools/patcher-configs/moz19-branch-patcher2.cfg b/mozilla/tools/patcher-configs/moz19-branch-patcher2.cfg
index 1c427647714..00f5809fc72 100644
--- a/mozilla/tools/patcher-configs/moz19-branch-patcher2.cfg
+++ b/mozilla/tools/patcher-configs/moz19-branch-patcher2.cfg
@@ -5,25 +5,25 @@
             <rc>
             </rc>
             channel   beta release
-            details   http://www.mozilla.com/%locale%/firefox/3.0.17/releasenotes/
+            details   http://www.mozilla.com/%locale%/firefox/3.0.18/releasenotes/
             <partial>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.17-candidates/build1/firefox-3.0.16-3.0.17.%locale%.%platform%.partial.mar
-                url   http://download.mozilla.org/?product=firefox-3.0.17-partial-3.0.16&os=%bouncer-platform%&lang=%locale%
-                path   firefox/nightly/3.0.17-candidates/build1/firefox-3.0.16-3.0.17.%locale%.%platform%.partial.mar
-                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.17-candidates/build1/firefox-3.0.16-3.0.17.%locale%.%platform%.partial.mar
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.18-candidates/build1/firefox-3.0.17-3.0.18.%locale%.%platform%.partial.mar
+                url   http://download.mozilla.org/?product=firefox-3.0.18-partial-3.0.17&os=%bouncer-platform%&lang=%locale%
+                path   firefox/nightly/3.0.18-candidates/build1/firefox-3.0.17-3.0.18.%locale%.%platform%.partial.mar
+                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.18-candidates/build1/firefox-3.0.17-3.0.18.%locale%.%platform%.partial.mar
             </partial>
             force   modules/distribution.js
             force   Contents/MacOS/modules/distribution.js
             force   freebl3.chk
             force   softokn3.chk
-            to   3.0.17
-            from   3.0.16
+            to   3.0.18
+            from   3.0.17
             beta-dir   beta
             <complete>
-                beta-url   http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.17-candidates/build1/firefox-3.0.17.%locale%.%platform%.complete.mar
-                url   http://download.mozilla.org/?product=firefox-3.0.17-complete&os=%bouncer-platform%&lang=%locale%
-                path   firefox/nightly/3.0.17-candidates/build1/firefox-3.0.17.%locale%.%platform%.complete.mar
-                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.17-candidates/build1/firefox-3.0.17.%locale%.%platform%.complete.mar
+                beta-url   http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.18-candidates/build1/firefox-3.0.18.%locale%.%platform%.complete.mar
+                url   http://download.mozilla.org/?product=firefox-3.0.18-complete&os=%bouncer-platform%&lang=%locale%
+                path   firefox/nightly/3.0.18-candidates/build1/firefox-3.0.18.%locale%.%platform%.complete.mar
+                betatest-url   http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.18-candidates/build1/firefox-3.0.18.%locale%.%platform%.complete.mar
             </complete>
         </current-update>
         past-update   3.0a1 3.0a2 betatest beta releasetest
@@ -57,6 +57,7 @@
         past-update   3.0.13 3.0.14 betatest releasetest beta release
         past-update   3.0.14 3.0.15 betatest releasetest beta release
         past-update   3.0.15 3.0.16 betatest releasetest beta release
+        past-update   3.0.16 3.0.17 betatest releasetest beta release
         <release>
             <3.0rc2>
                 prettyVersion   3.0 RC 2
@@ -512,6 +513,24 @@
                 extension-version   3.0.1
                 completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.1-candidates/build1/firefox-3.0.1.%locale%.%platform%.complete.mar
             </3.0.1>
+            <3.0.18>
+                prettyVersion   3.0.18
+                <platforms>
+                    linux-i686   2010020219
+                    win32   2010020220
+                    mac   2010020219
+                </platforms>
+                <exceptions>
+                    gu-IN   linux-i686, win32
+                    ja   linux-i686, win32
+                    ja-JP-mac   mac
+                </exceptions>
+                version   3.0.18
+                locales   af ar be bg bn-IN ca cs cy da de el en-GB en-US eo es-AR es-ES et eu fi fr fy-NL ga-IE gl gu-IN he hi-IN hu id is it ja ja-JP-mac ka kn ko ku lt lv mk mn mr nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE te th tr uk zh-CN zh-TW
+                schema   1
+                extension-version   3.0.18
+                completemarurl   http://stage-old.mozilla.org/pub/mozilla.org/firefox/nightly/3.0.18-candidates/build1/firefox-3.0.18.%locale%.%platform%.complete.mar
+            </3.0.18>
             <3.0.9>
                 prettyVersion   3.0.9
                 <platforms>