diff --git a/browser/installer/osx/packages-static b/browser/installer/osx/packages-static
index 57e261801871..e9d93208a79e 100644
--- a/browser/installer/osx/packages-static
+++ b/browser/installer/osx/packages-static
@@ -111,7 +111,6 @@
 @BINPATH@/components/exthelper.xpt
 @BINPATH@/components/fastfind.xpt
 @BINPATH@/components/feeds.xpt
-@BINPATH@/components/filepicker.xpt
 @BINPATH@/components/find.xpt
 @BINPATH@/components/fuel.xpt
 @BINPATH@/components/gfx.xpt
@@ -155,7 +154,6 @@
 @BINPATH@/components/prefetch.xpt
 @BINPATH@/components/pref.xpt
 @BINPATH@/components/proxyObjInst.xpt
-@BINPATH@/components/toolkitremote.xpt
 @BINPATH@/components/rdf.xpt
 @BINPATH@/components/satchel.xpt
 @BINPATH@/components/saxparser.xpt
@@ -212,7 +210,6 @@
 @BINPATH@/components/storage-mozStorage.js
 @BINPATH@/components/jsconsole-clhandler.js
 @BINPATH@/components/nsTryToClose.js
-@BINPATH@/components/nsFilePicker.js
 @BINPATH@/components/nsHelperAppDlg.js
 @BINPATH@/components/nsDownloadManagerUI.js
 @BINPATH@/components/nsProxyAutoConfig.js
@@ -227,8 +224,6 @@
 @BINPATH@/components/update.xpt
 @BINPATH@/components/nsSessionStartup.js
 @BINPATH@/components/nsSessionStore.js
-@BINPATH@/components/aboutPrivateBrowsing.js
-@BINPATH@/components/aboutSessionRestore.js
 @BINPATH@/components/sessionstore.xpt
 @BINPATH@/components/nsURLFormatter.js
 @BINPATH@/components/urlformatter.xpt
@@ -244,11 +239,9 @@
 @BINPATH@/components/nsContentDispatchChooser.js
 @BINPATH@/components/nsHandlerService.js
 @BINPATH@/components/nsWebHandlerApp.js
-@BINPATH@/components/aboutRights.js
-@BINPATH@/components/aboutRobots.js
-@BINPATH@/components/aboutCertError.js
 @BINPATH@/components/nsBadCertHandler.js
 @BINPATH@/components/nsFormAutoComplete.js
+@BINPATH@/components/libalerts_s.dylib
 
 ; Modules
 @BINPATH@/modules/*
@@ -265,8 +258,6 @@
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
-@BINPATH@/chrome/comm.jar
-@BINPATH@/chrome/comm.manifest
 @BINPATH@/chrome/toolkit.jar
 @BINPATH@/chrome/toolkit.manifest
 @BINPATH@/@PREF_DIR@/reporter.js
diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
index 98981038928e..f3855d19f09d 100644
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -773,6 +773,11 @@ components/xulapp.xpt
 components/xuldoc.xpt
 components/xultmpl.xpt
 components/zipwriter.xpt
+components/firefox.xpt
+run-mozilla.sh
+firefox
+dependentlibs.list
+components/nsProgressDialog.js
 #endif
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index f3985a8abc8f..632d1eae02b7 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -347,7 +347,7 @@ ifdef MOZ_PKG_MANIFEST
 	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
 		 "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
 		"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
-	$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)" --debug=10
+	$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
 else # !MOZ_PKG_MANIFEST
 ifeq ($(MOZ_PKG_FORMAT),DMG)
 # If UNIVERSAL_BINARY, the package will be made from an already-prepared