diff --git a/mozilla/build/mac/BuildNGLayout.pl b/mozilla/build/mac/BuildNGLayout.pl
index 39a80ec5a33..047adfaf20f 100644
--- a/mozilla/build/mac/BuildNGLayout.pl
+++ b/mozilla/build/mac/BuildNGLayout.pl
@@ -70,12 +70,6 @@ if ($build{all})
 chdir("::::");
 $MOZ_SRC = cwd();
 
-if ($MOZ_FULLCIRCLE)
-{
-	#// Get the Build Number for the Master.ini(Full Circle) n'stuff
-	$buildnum = Moz::SetBuildNumber();
-}
-
 OpenErrorLog("NGLayoutBuildLog");
 #OpenErrorLog("Mozilla.BuildLog");		# Tinderbox requires that name
 
@@ -86,6 +80,8 @@ if ($pull{all}) {
    Checkout();
 }
 
+SetBuildNumber();
+
 chdir($MOZ_SRC);
 BuildDist();
 
@@ -93,3 +89,4 @@ chdir($MOZ_SRC);
 BuildProjects();
 
 print "Build layout complete\n";
+
diff --git a/mozilla/build/mac/Moz.pm b/mozilla/build/mac/Moz.pm
index 77cce570018..4213a144f7f 100644
--- a/mozilla/build/mac/Moz.pm
+++ b/mozilla/build/mac/Moz.pm
@@ -380,8 +380,8 @@ sub InstallFromManifest($;$)
    close (BDATE);
    close (OUTPUT);
 
-   system ("perl :mozilla:config:aboutime.pl :mozilla:l10n:us:xp:about-all.html :mozilla:config:build_number");
-
+   system ("perl :mozilla:config:aboutime.pl :mozilla:xpfe:browser:src:navigator.xul :mozilla:config:build_number");
+die;
  }
 
 sub SetAgentString