diff --git a/mozilla/tools/patcher-configs/moz18-branch-major-update-patcher2.cfg b/mozilla/tools/patcher-configs/moz18-branch-major-update-patcher2.cfg
index f024bd4346c..74b2527287b 100644
--- a/mozilla/tools/patcher-configs/moz18-branch-major-update-patcher2.cfg
+++ b/mozilla/tools/patcher-configs/moz18-branch-major-update-patcher2.cfg
@@ -1,8 +1,8 @@
 <app Firefox>
 
   <current-update>
-    from = 2.0.0.11
-    to   = 3.0b2
+    from = 2.0.0.12
+    to   = 3.0b4
     channel = major
     testchannel = majortest
     details = "http://%locale%.www.mozilla.com/%locale%/firefox/2.0/details/index.html"
@@ -10,23 +10,23 @@
     updateType = major
 
     <complete>
-      path = "firefox-3.0b2.%locale%.%platform%.complete.mar"
-      url = "http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/experimental/bug394046/%platform%/%locale%/firefox-3.0b2.complete.mar"
+      path = "firefox-3.0b4.%locale%.%platform%.complete.mar"
+      url = "http://stage.mozilla.org/pub/mozilla.org/firefox/releases/3.0b4/update/%platform%/%locale%/firefox-3.0b4.complete.mar"
     </complete>
     <partial>
-      path = "firefox-3.0b2.%locale%.%platform%.complete.mar"
-      url = "http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/experimental/bug394046/%platform%/%locale%/firefox-3.0b2.complete.mar"
+      path = "firefox-3.0b4.%locale%.%platform%.complete.mar"
+      url = "http://stage.mozilla.org/pub/mozilla.org/firefox/releases/3.0b4/update/%platform%/%locale%/firefox-3.0b4.complete.mar"
     </partial>
   </current-update>
 
-  <release 2.0.0.11>
-    version = 2.0.0.11
-    completemarurl= "http://stage.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.11/update/%platform%/%locale%/firefox-2.0.0.11.complete.mar"
+  <release 2.0.0.12>
+    version = 2.0.0.12
+    completemarurl= "http://stage.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.12/update/%platform%/%locale%/firefox-2.0.0.12.complete.mar"
 
     <platforms>
-      win32      = 2007112718
-      linux-i686 = 2007112718
-      mac        = 2007112718
+      win32      = 2008020121
+      linux-i686 = 2008020121
+      mac        = 2008020121
     </platforms>
 
     locales = af ar be bg ca cs da de el en-GB en-US es-AR es-ES eu fi fr \
@@ -41,24 +41,24 @@
     </exceptions>
   </release>
 
-  <release 3.0b2>
-    version = 3.0 Beta 2
-    extension-version = 3.0b2
+  <release 3.0b4>
+    version = 3.0b4
+    prettyVersion = 3.0 Beta 4
+    extension-version = 3.0b4
     schema = 1
-    completemarurl = "http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/experimental/bug394046/%platform%/%locale%/firefox-3.0b2.complete.mar"
+    completemarurl = "http://stage.mozilla.org/pub/mozilla.org/firefox/releases/3.0b4/update/%platform%/%locale%/firefox-3.0b4.complete.mar"
 
     <platforms>
-      win32      = 2007121120
-      linux-i686 = 2007121016
-      mac        = 2007121014
+      win32      = 2008030714
+      linux-i686 = 2008030318
+      mac        = 2008030317
     </platforms>
 
-    locales = be ca cs de el en-US es-AR es-ES eu fi fr fy-NL gu-IN \
-              he it ja ja-JP-mac ko nb-NO nl pa-IN pl pt-PT ro ru \
-              sk sv-SE tr uk zh-CN
+    locales = ar be 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-JP-mac ja ka ko lt mk nb-NO \
+              nl pa-IN pl pt-BR pt-PT ro ru sk sq sv-SE tr uk zh-CN zh-TW
 
     <exceptions>
-      pt-PT = linux-i686, mac
       ja = win32, linux-i686
       ja-JP-mac = mac
     </exceptions>