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 aa8c1a89f85..2c375a5ee31 100644
--- a/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg
+++ b/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg
@@ -319,7 +319,7 @@ prestageFactory.addStep(ShellCommand, description='create cvsmirror mofo',
 
 c['builders'].append({'name': 'prestage',
                       'slavename': 'staging-1.9-master',
-                      'category': 'release',
+                      'category': 'release', 'locks': [linux_lock],
                       'builddir': 'prestage', 'factory': prestageFactory })
 
 
@@ -348,7 +348,7 @@ tagFactory.addStep(ShellCommand, description='do valid l10n checkout',
                    workdir="/tmp")
 
 c['builders'].append({ 'name': 'tag', 'slavename': 'staging-1.9-master',
-                       'category': 'release',
+                       'category': 'release', 'locks': [linux_lock],
                        'builddir': 'tag', 'factory': tagFactory })
 
 sourceFactory = factory.BuildFactory()
@@ -369,7 +369,7 @@ sourceFactory.addStep(ShellCommand, description='Source', workdir='build',
                       timeout=36000, haltOnFailure=1)
 
 c['builders'].append({ 'name': 'source', 'slavename': 'staging-1.9-master',
-                       'category': 'release',
+                       'category': 'release', 'locks': [linux_lock],
                        'builddir': 'source', 'factory': sourceFactory })
 
 buildFactory = factory.BuildFactory()
@@ -439,7 +439,7 @@ signFactory.addStep(ShellCommand, description='Waiting for win32_signing_rc(n).l
                     timeout=86400, haltOnFailure=1)
 
 c['builders'].append({ 'name': 'sign', 'slavename': 'staging-1.9-master',
-                       'category': 'release',
+                       'category': 'release', 'locks': [linux_lock],
                        'builddir': 'sign', 'factory': signFactory })
 
 l10nverifyFactory = factory.BuildFactory()
@@ -500,7 +500,7 @@ updateFactory.addStep(ShellCommand, description='Updates (announce)',
                       timeout=36000, haltOnFailure=1)
 
 c['builders'].append({ 'name': 'update', 'slavename': 'staging-1.9-master',
-                       'category': 'release',
+                       'category': 'release', 'locks': [linux_lock],
                        'builddir': 'update', 'factory': updateFactory })
 
 updateverifyFactory = factory.BuildFactory()
@@ -522,14 +522,14 @@ updateverifyFactory.addStep(ShellCommand, description='update verificaton', work
                      timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'})
 
 c['builders'].append({ 'name': 'linux_update_verify', 'slavename': 'fx-linux-1.9-slave1',
-                       'category': 'release',
+                       'category': 'release', 'locks': [linux_lock],
                        'builddir': 'linux_update_verify', 'factory': updateverifyFactory })
 c['builders'].append({ 'name': 'win32_update_verify', 'slavename': 'fx-win32-1.9-slave1',
-                       'category': 'release',
+                       'category': 'release', 'locks': [win32_lock],
                        'builddir': 'win32_update_verify', 'factory': updateverifyFactory })
 c['builders'].append({ 'name': 'macosx_update_verify', 'slavename': 'fx-mac-1.9-slave1',
-                       'category': 'release',
-                       'locks': [macosx_lock], 'builddir': 'macosx_update_verify', 'factory': updateverifyFactory })
+                       'category': 'release', 'locks': [macosx_lock], 
+                       'builddir': 'macosx_update_verify', 'factory': updateverifyFactory })
 
 stageFactory = factory.BuildFactory()
 stageFactory.addStep(ShellCommand, description='clean checkout',
@@ -549,9 +549,47 @@ stageFactory.addStep(ShellCommand, description='Stage', workdir='build',
                      timeout=36000, haltOnFailure=1)
 
 c['builders'].append({ 'name': 'stage', 'slavename': 'staging-1.9-master',
-                       'category': 'release',
+                       'category': 'release', 'locks': [linux_lock],
                        'builddir': 'stage', 'factory': stageFactory })
 
+xrBuildFactory = factory.BuildFactory()
+xrBuildFactory.addStep(ShellCommand, description='clean checkout',
+                     workdir='.', command=['rm', '-rfv', 'build'],
+                     haltOnFailure=1)
+xrBuildFactory.addStep(ShellCommand, description='checkout', workdir='.',
+                     command=['cvs', '-z3', '-d', cvsroot, 'co', '-r', automation_tag,
+                     '-d', 'build', cvsmodule], haltOnFailure=1)
+xrBuildFactory.addStep(ShellCommand, description='clean logs area',
+                     command=['make', 'clean_logs'], haltOnFailure=1)
+xrBuildFactory.addStep(FileDownload, mastersrc="xr-bootstrap.cfg", 
+                     slavedest="bootstrap.cfg", workdir="build"),
+xrBuildFactory.addStep(ShellCommand, description='unit tests',
+                     command=['make', 'test'], haltOnFailure=1)
+xrBuildFactory.addStep(ShellCommand, description='clean tinder-config area', workdir='build',
+                     command=['rm', '-rfv', '/builds/config'])
+xrBuildFactory.addStep(ShellCommand, description='Build', workdir='build',
+                     command=['perl', './release', '-o', 'Build'], 
+                     timeout=36000, haltOnFailure=1, env={'CVS_RSH': 'ssh'})
+
+c['builders'].append({ 'name': 'linux_xr_build',
+                       'slavename': 'fx-linux-1.9-slave1',
+                       'builddir': 'linux_xr_build',
+                       'locks': [linux_lock],
+                       'category': 'release',
+                       'factory': xrBuildFactory })
+c['builders'].append({ 'name': 'win32_xr_build',
+                       'slavename': 'fx-win32-1.9-slave1',
+                       'builddir': 'win32_xr_build',
+                       'locks': [win32_lock],
+                       'category': 'release',
+                       'factory': xrBuildFactory })
+c['builders'].append({ 'name': 'macosx_xr_build',
+                       'slavename': 'fx-mac-1.9-slave1',
+                       'builddir': 'macosx_xr_build',
+                       'locks': [macosx_lock],
+                       'category': 'release',
+                       'factory': xrBuildFactory })
+
 ####### STATUS TARGETS
 
 # 'status' is a list of Status Targets. The results of each build will be