diff --git a/build/mac/build_scripts/Moz/Jar.pm b/build/mac/build_scripts/Moz/Jar.pm
index 2c3e9f75ea20..e73836f8d1db 100644
--- a/build/mac/build_scripts/Moz/Jar.pm
+++ b/build/mac/build_scripts/Moz/Jar.pm
@@ -416,6 +416,8 @@ sub registerChromePackage($$$$$$)
     my($manifest_subdir) = $jar_file;
     $manifest_subdir =~ s/:/\//g;
     
+    if (index($manifest_subdir, "-unix") == -1 && index($manifest_subdir, "-win") == -1) {
+
     my($chrome_entry);
     
     if ($main::options{use_jars}) {
@@ -451,6 +453,7 @@ sub registerChromePackage($$$$$$)
     print(CHROMEFILE "${chrome_entry}\n");
     close(CHROMEFILE) || die "Error: Failed to close $inst_chrome\n";
     print "+++ adding chrome $inst_chrome\n+++\t\t$chrome_entry\n";
+  }
 }
 
 #-------------------------------------------------------------------------------
diff --git a/build/mac/build_scripts/MozillaBuildList.pm b/build/mac/build_scripts/MozillaBuildList.pm
index b048ef87e479..ba7c8e6e70ec 100644
--- a/build/mac/build_scripts/MozillaBuildList.pm
+++ b/build/mac/build_scripts/MozillaBuildList.pm
@@ -648,10 +648,8 @@ sub ProcessJarManifests()
     CreateJarFromManifest(":mozilla:xpfe:components:prefwindow:resources:locale:en-US:unix:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:xpfe:components:prefwindow:resources:locale:en-US:win:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:xpfe:components:prefwindow:resources:locale:en-US:mac:jar.mn", $chrome_dir, \%jars);
-    CreateJarFromManifest(":mozilla:xpfe:communicator:resources:locale:en-US:mac:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:xpfe:global:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:xpfe:global:resources:content:mac:jar.mn", $chrome_dir, \%jars);
-    CreateJarFromManifest(":mozilla:xpfe:global:resources:locale:en-US:mac:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:xpinstall:res:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:embedding:components:webbrowserpersist:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:embedding:components:ui:jar.mn", $chrome_dir, \%jars);