diff --git a/mozilla/build/mac/NGLayoutBuildList.pm b/mozilla/build/mac/NGLayoutBuildList.pm
index 1210117bcf5..dea3355d79d 100644
--- a/mozilla/build/mac/NGLayoutBuildList.pm
+++ b/mozilla/build/mac/NGLayoutBuildList.pm
@@ -839,6 +839,7 @@ sub BuildIDLProjects()
 	}
 
 	BuildIDLProject(":mozilla:modules:libpref:macbuild:libprefIDL.mcp",				"libpref");
+	BuildIDLProject(":mozilla:modules:libutil:macbuild:libutilIDL.mcp",				"libutil");
 	BuildIDLProject(":mozilla:modules:libjar:macbuild:libjarIDL.mcp",				"libjar");
 	BuildIDLProject(":mozilla:modules:oji:macbuild:ojiIDL.mcp",						"oji");
 	BuildIDLProject(":mozilla:js:macbuild:XPConnectIDL.mcp", 						"xpconnect");
diff --git a/mozilla/config/mac/DefinesMozilla.h b/mozilla/config/mac/DefinesMozilla.h
index 5685a3f44ba..db97de27bb8 100644
--- a/mozilla/config/mac/DefinesMozilla.h
+++ b/mozilla/config/mac/DefinesMozilla.h
@@ -90,4 +90,7 @@
 
 #define DETECT_WEBSHELL_LEAKS 1
 
+//#define MOZ_PERF_METRICS 1		// Uncomment to get metrics in layout, parser and webshell.
+															// You also need to define __TIMESIZE_DOUBLE__ in <timesize.mac.h>
+
 #endif /* DefinesMozilla_h_ */
diff --git a/mozilla/htmlparser/macbuild/htmlparser.mcp b/mozilla/htmlparser/macbuild/htmlparser.mcp
index 31d00d511ab..c296f178d8a 100644
Binary files a/mozilla/htmlparser/macbuild/htmlparser.mcp and b/mozilla/htmlparser/macbuild/htmlparser.mcp differ
diff --git a/mozilla/layout/macbuild/layout.mcp b/mozilla/layout/macbuild/layout.mcp
index 95593327d19..106eb0ecdd5 100644
Binary files a/mozilla/layout/macbuild/layout.mcp and b/mozilla/layout/macbuild/layout.mcp differ
diff --git a/mozilla/modules/libutil/macbuild/libutil.exp b/mozilla/modules/libutil/macbuild/libutil.exp
index bbc48fb3fa3..4bedbe7f456 100644
--- a/mozilla/modules/libutil/macbuild/libutil.exp
+++ b/mozilla/modules/libutil/macbuild/libutil.exp
@@ -8,3 +8,15 @@ XP_NotifyObservers
 XP_DisableObserverNotification
 XP_EnableObserverNotification
 XP_IsObserverNotificationEnabled
+Print__9StopwatchFv
+GetCPUTime__9StopwatchFv
+GetRealTime__9StopwatchFv
+CpuTime__9StopwatchFv
+RealTime__9StopwatchFv
+Continue__9StopwatchFv
+RestoreState__9StopwatchFv
+SaveState__9StopwatchFv
+Stop__9StopwatchFv
+Start__9StopwatchFi
+__dt__9StopwatchFv
+__ct__9StopwatchFv
diff --git a/mozilla/modules/libutil/macbuild/libutil.mcp b/mozilla/modules/libutil/macbuild/libutil.mcp
index 2b9f5cffa26..fc0291a9878 100644
Binary files a/mozilla/modules/libutil/macbuild/libutil.mcp and b/mozilla/modules/libutil/macbuild/libutil.mcp differ
diff --git a/mozilla/modules/libutil/src/stopwatch.cpp b/mozilla/modules/libutil/src/stopwatch.cpp
index 2d39775fdc1..2964ee8eb46 100644
--- a/mozilla/modules/libutil/src/stopwatch.cpp
+++ b/mozilla/modules/libutil/src/stopwatch.cpp
@@ -130,7 +130,8 @@ double Stopwatch::CpuTime() {
 
 double Stopwatch::GetRealTime(){ 
 #if defined(R__MAC)
-   return(double)clock() / gTicks;
+// return(double)clock() / gTicks;
+   return(double)clock() / 1000000L;
 #elif defined(R__UNIX)
    struct tms cpt;
    return (double)times(&cpt) / gTicks;
@@ -150,7 +151,8 @@ double Stopwatch::GetRealTime(){
 
 double Stopwatch::GetCPUTime(){ 
 #if defined(R__MAC)
-   return(double)clock() / gTicks;
+// return(double)clock() / gTicks;
+   return(double)clock();
 #elif defined(R__UNIX)
    struct tms cpt;
    times(&cpt);
diff --git a/mozilla/parser/htmlparser/macbuild/htmlparser.mcp b/mozilla/parser/htmlparser/macbuild/htmlparser.mcp
index 31d00d511ab..c296f178d8a 100644
Binary files a/mozilla/parser/htmlparser/macbuild/htmlparser.mcp and b/mozilla/parser/htmlparser/macbuild/htmlparser.mcp differ
diff --git a/mozilla/webshell/macbuild/webshell.mcp b/mozilla/webshell/macbuild/webshell.mcp
index 9ecb58cac8c..7b9a9794e31 100644
Binary files a/mozilla/webshell/macbuild/webshell.mcp and b/mozilla/webshell/macbuild/webshell.mcp differ