diff --git a/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl b/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl
index f063b4e75e5..51d11d33f9f 100644
--- a/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl
@@ -109,7 +109,7 @@ $MozAssertBehavior = 'stack-and-abort';
 # Note that win32 may not need \@, depends on ' or ".
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
 
-$moz_cvsroot   = ':ext:cltbld@cvs.mozilla.org:/cvsroot';
+$moz_cvsroot   = ':ext:ffxbld@cvs.mozilla.org:/cvsroot';
 #$moz_cvsroot   = ":pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot";
 
 #- Set these proper values for your tinderbox server
diff --git a/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl b/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl
index 012e8c4a681..24c5e6bde15 100644
--- a/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl
@@ -114,7 +114,7 @@ $MozAssertBehavior = 'stack-and-abort';
 # Note that win32 may not need \@, depends on ' or ".
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
 
-$moz_cvsroot   = ':ext:cltbld@cvs.mozilla.org:/cvsroot';
+$moz_cvsroot   = ':ext:ffxbld@cvs.mozilla.org:/cvsroot';
 #$moz_cvsroot   = ":pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot";
 
 #- Set these proper values for your tinderbox server
diff --git a/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl b/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
index cc2cac108a2..41614260707 100644
--- a/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl
@@ -146,9 +146,7 @@ $use_blat       = 0;
 # :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
 
 #$moz_cvsroot   = $ENV{CVSROOT};
-$moz_cvsroot = ':ext:cltbld@cvs.mozilla.org:/cvsroot';
-
-$MofoRoot = ':ext:cltbld@cvs.mozilla.org:/mofo';
+$moz_cvsroot = ':ext:ffxbld@cvs.mozilla.org:/cvsroot';
 
 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';