diff --git a/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg b/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg
index fbcca4baddc..c110f1b2355 100644
--- a/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg
+++ b/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg
@@ -11,12 +11,15 @@ c = BuildmasterConfig = {}
 # the 'bots' list defines the set of allowable buildslaves. Each element is a
 # tuple of bot-name and bot-password. These correspond to values given to the
 # buildslave's mktap invocation.
-c['bots'] = [
- ("staging-1.9-master",""),
- ("fx-linux-1.9-slave1",""),
- ("fx-win32-1.9-slave1", ""),
- ("mini-test", ""),
- ("fx-mac-1.9-slave1", ""),
+
+from buildbot.buildslave import BuildSlave
+
+c['slaves'] = [
+ BuildSlave("staging-1.9-master",""),
+ BuildSlave("fx-linux-1.9-slave1",""),
+ BuildSlave("fx-win32-1.9-slave1", ""),
+ BuildSlave("mini-test", ""),
+ BuildSlave("fx-mac-1.9-slave1", ""),
 ]
 
 # 'slavePortnum' defines the TCP port to listen on. This must match the value
@@ -30,11 +33,11 @@ c['slavePortnum'] = 9989
 # source code changes. Any class which implements IChangeSource can be added
 # to this list: there are several in buildbot/changes/*.py to choose from.
 
-c['sources'] = []
+c['change_source'] = []
 
 from buildbot.changes import bonsaipoller
 
-#c['sources'].append(
+#c['change_source'].append(
 # bonsaipoller.BonsaiPoller(
 #  bonsaiURL = 'http://bonsai.mozilla.org',
 #  module = 'PhoenixTinderbox',
@@ -133,7 +136,7 @@ c['schedulers'].append(sign_depscheduler)
 c['schedulers'].append(update_depscheduler)
 c['schedulers'].append(stage_depscheduler)
 
-c['sources'].append(PBChangeSource())
+c['change_source'].append(PBChangeSource())
 
 ####### BUILDERS
 
@@ -316,6 +319,7 @@ slavePrestageFactory = BootstrapFactory(
 slavePrestageFactory.addStep(ShellCommand,
  description='clean staging area',
  command=['make', 'clean_stage'],
+ timeout=3600,
  haltOnFailure=1,
 )
 
@@ -431,14 +435,6 @@ tagFactory.addStep(ShellCommand,
  timeout=36000,
  haltOnFailure=1,
 )
-# work around CVS val-tags problem
-# http://weblogs.mozillazine.org/preed/2006/10/a_case_of_the_mondays_on_a_wed.html
-tagFactory.addStep(ShellCommand,
- description='do valid l10n checkout',
- command=['cvs', '-d', '/builds/cvsmirror/l10n', 'co', '-r', 
-          'FIREFOX_3_0b5_RELEASE', 'l10n/de/browser/README.txt'],
- workdir="/tmp",
-)
 
 c['builders'].append(
  { 
@@ -571,13 +567,13 @@ signFactory = BootstrapFactory(
 signFactory.addStep(ShellCommand,
  description='Fake signing log',
  command=['/bin/bash', '-c', 
-          '""/bin/touch /home/ftp/pub/firefox/nightly/3.0rc1-candidates/build1/unsigned/win32_signing_build1.log""'],
+          '""/bin/touch /home/ftp/pub/firefox/nightly/3.0rc2-candidates/build1/unsigned/win32_signing_build1.log""'],
  haltOnFailure=1,
 )
 signFactory.addStep(ShellCommand,
  description='Fake signing',
  command=['/bin/bash', '-c',
-          '""/bin/ln -fs /home/ftp/pub/firefox/nightly/3.0rc1-candidates/build1/unsigned/* /home/ftp/pub/firefox/nightly/3.0rc1-candidates/build1/""'],
+          '""/bin/ln -fs /home/ftp/pub/firefox/nightly/3.0rc2-candidates/build1/unsigned/* /home/ftp/pub/firefox/nightly/3.0rc1-candidates/build1/""'],
  haltOnFailure=1,
 )
 signFactory.addStep(ShellCommand,
@@ -818,24 +814,7 @@ c['status'] = []
 
 from buildbot.status import html
 c['status'].append(
- html.Waterfall(
-  http_port=8810,
-  css='./mozilla.css',
- )
-)
-c['status'].append(
- html.Waterfall(
-  http_port=8811,
-  css='./mozilla.css', 
-  categories = ['nightly','nightly_experimental'],
- )
-)
-c['status'].append(
- html.Waterfall(
-  http_port=8812,
-  css='./mozilla.css', 
-  categories = ['release'],
- )
+ html.WebStatus(http_port=8810)
 )
 
 from buildbot.status import tinderbox
@@ -847,16 +826,6 @@ c['status'].append(tinderbox.TinderboxMailNotifier(
  logCompression="bzip2")
 )
    
-from buildbot.status.mail import MailNotifier
-c['status'].append(MailNotifier(
- fromaddr="bootstrap@mozilla.com",
- sendToInterestedUsers=False,
- extraRecipients=["build@mozilla.org"],
- mode="passing",
- builders=["tag", "linux_build", "macosx_build", "sign", "stage"],
- relayhost="smtp.mozilla.org"),
-)
-  
 ####### DEBUGGING OPTIONS
 #c['debugPassword'] = "debugpassword"
 #from buildbot import manhole