diff --git a/mozilla/tools/tinderbox/build-seamonkey-util.pl b/mozilla/tools/tinderbox/build-seamonkey-util.pl
index cc4a326323e..cd957233c51 100644
--- a/mozilla/tools/tinderbox/build-seamonkey-util.pl
+++ b/mozilla/tools/tinderbox/build-seamonkey-util.pl
@@ -18,7 +18,7 @@ use POSIX qw(sys_wait_h strftime);
 use Cwd;
 use File::Basename; # for basename();
 use Config; # for $Config{sig_name} and $Config{sig_num}
-$::UtilsVersion = '$Revision: 1.17 $ ';
+$::UtilsVersion = '$Revision: 1.18 $ ';
 
 package TinderUtils;
 
@@ -243,6 +243,7 @@ sub GetSystemInfo {
             }
         }
     }
+    $Settings::BuildName .= " $Settings::BuildNameExtra";
 }
 
 sub LoadConfig {
@@ -556,7 +557,7 @@ sub BuildIt {
             my $make = "$Settings::Make -f client.mk";
             my $targets = $TreeSpecific::checkout_target;
             $targets = $TreeSpecific::checkout_clobber_target unless $Settings::BuildDepend;
-            mkdir $Settings::ObjDir, 0777 if ($Settings::ObjDir && ! -e $Settings::ObjDir);
+	    mkdir $Settings::ObjDir, 0777 if ($Settings::ObjDir && ! -e $Settings::ObjDir);
 
             my $status = run_shell_command "$make $targets";
             if ($status != 0) {
diff --git a/mozilla/tools/tinderbox/build-seamonkey.pl b/mozilla/tools/tinderbox/build-seamonkey.pl
index ff296fb31e9..18af127ecb5 100755
--- a/mozilla/tools/tinderbox/build-seamonkey.pl
+++ b/mozilla/tools/tinderbox/build-seamonkey.pl
@@ -12,9 +12,10 @@ use strict;
 # They are not initialized here. The default values are after "__END__".
 $TreeSpecific::name = $TreeSpecific::checkout_target = $TreeSpecific::checkout_clobber_target = $::Version = undef;
 
-$::Version = '$Revision: 1.94 $ ';
+$::Version = '$Revision: 1.95 $ ';
 
 {
+    $ENV{CVSROOT} = ":pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot";
     TinderUtils::Setup();
     tree_specific_overides();
     TinderUtils::Build();
@@ -26,7 +27,6 @@ $::Version = '$Revision: 1.94 $ ';
 
 
 sub tree_specific_overides {
-    $ENV{CVSROOT} = ":pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot";
 
 	$TreeSpecific::name = 'mozilla';
 	$TreeSpecific::checkout_target = '';