diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
index df2c7961a8b8..390ece56e7e0 100644
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -632,6 +632,145 @@ res/cursors/CVS/Entries
 res/cursors/CVS/Repository
 res/cursors/CVS/Root
 res/cursors/CVS/Tag
+components/alerts.xpt
+components/appshell.xpt
+components/appstartup.xpt
+components/autocomplete.xpt
+components/autoconfig.xpt
+components/browser-feeds.xpt
+components/browsercompsbase.xpt
+components/browserplaces.xpt
+components/caps.xpt
+components/chardet.xpt
+components/chrome.xpt
+components/commandhandler.xpt
+components/commandlines.xpt
+components/composer.xpt
+components/content.xpt
+components/content_base.xpt
+components/content_html.xpt
+components/content_htmldoc.xpt
+components/content_xmldoc.xpt
+components/content_xslt.xpt
+components/content_xtf.xpt
+components/contentprefs.xpt
+components/cookie.xpt
+components/directory.xpt
+components/docshell.xpt
+components/dom.xpt
+components/dom_base.xpt
+components/dom_canvas.xpt
+components/dom_core.xpt
+components/dom_css.xpt
+components/dom_events.xpt
+components/dom_geolocation.xpt
+components/dom_html.xpt
+components/dom_json.xpt
+components/dom_loadsave.xpt
+components/dom_offline.xpt
+components/dom_range.xpt
+components/dom_sidebar.xpt
+components/dom_smil.xpt
+components/dom_storage.xpt
+components/dom_stylesheets.xpt
+components/dom_svg.xpt
+components/dom_threads.xpt
+components/dom_traversal.xpt
+components/dom_views.xpt
+components/dom_xbl.xpt
+components/dom_xpath.xpt
+components/dom_xul.xpt
+components/downloads.xpt
+components/editor.xpt
+components/embed_base.xpt
+components/extensions.xpt
+components/exthandler.xpt
+components/exthelper.xpt
+components/fastfind.xpt
+components/feeds.xpt
+components/find.xpt
+components/fuel.xpt
+components/gfx.xpt
+components/htmlparser.xpt
+components/imgicon.xpt
+components/imglib2.xpt
+components/inspector.xpt
+components/intl.xpt
+components/jar.xpt
+components/jsdservice.xpt
+components/layout_base.xpt
+components/layout_printing.xpt
+components/layout_xul.xpt
+components/layout_xul_tree.xpt
+components/locale.xpt
+components/loginmgr.xpt
+components/lwbrk.xpt
+components/microsummaries.xpt
+components/migration.xpt
+components/mimetype.xpt
+components/mozbrwsr.xpt
+components/mozfind.xpt
+components/necko.xpt
+components/necko_about.xpt
+components/necko_cache.xpt
+components/necko_cookie.xpt
+components/necko_dns.xpt
+components/necko_file.xpt
+components/necko_ftp.xpt
+components/necko_http.xpt
+components/necko_res.xpt
+components/necko_socket.xpt
+components/necko_strconv.xpt
+components/necko_viewsource.xpt
+components/necko_wifi.xpt
+components/parentalcontrols.xpt
+components/pipboot.xpt
+components/pipnss.xpt
+components/pippki.xpt
+components/places.xpt
+components/plugin.xpt
+components/pref.xpt
+components/prefetch.xpt
+components/profile.xpt
+components/proxyObjInst.xpt
+components/rdf.xpt
+components/satchel.xpt
+components/saxparser.xpt
+components/sessionstore.xpt
+components/shellservice.xpt
+components/shistory.xpt
+components/spellchecker.xpt
+components/storage.xpt
+components/toolkitprofile.xpt
+components/toolkitsearch.xpt
+components/txmgr.xpt
+components/txtsvc.xpt
+components/uconv.xpt
+components/unicharutil.xpt
+components/update.xpt
+components/uriloader.xpt
+components/url-classifier.xpt
+components/urlformatter.xpt
+components/webBrowser_core.xpt
+components/webbrowserpersist.xpt
+components/webshell_idls.xpt
+components/widget.xpt
+components/widget_cocoa.xpt
+components/windowds.xpt
+components/windowwatcher.xpt
+components/xpcom_base.xpt
+components/xpcom_components.xpt
+components/xpcom_ds.xpt
+components/xpcom_io.xpt
+components/xpcom_system.xpt
+components/xpcom_threads.xpt
+components/xpcom_xpti.xpt
+components/xpconnect.xpt
+components/xpinstall.xpt
+components/xulapp.xpt
+components/xuldoc.xpt
+components/xultmpl.xpt
+components/zipwriter.xpt
 #endif
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 11440550b549..27b5dd48b425 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -355,6 +355,10 @@ ifeq ($(MOZ_PKG_FORMAT),DMG)
 ifndef UNIVERSAL_BINARY
 ifndef STAGE_SDK
 	@cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
+	@echo "Linking XPT files..."
+	@rm -rf $(DIST)/xpt
+	@$(NSINSTALL) -D $(DIST)/xpt
+	@($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/.  Continuing...
 else
 	@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
 endif