diff --git a/mobile/installer/Makefile.in b/mobile/installer/Makefile.in
index ca054e95cffb..ca21c482a425 100644
--- a/mobile/installer/Makefile.in
+++ b/mobile/installer/Makefile.in
@@ -43,67 +43,6 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
-GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
-ABS_OBJDIR=`cd $(DEPTH); pwd`
-ABS_TOPSRCDIR=$(shell cd $(topsrcdir); pwd)
-BASE64_ICON = dist/branding/fennec_maemo_icon26.txt
-MOZ_DEB_TIMESTAMP = "$(shell date  +"%a, %d  %b %Y %T %z" )"
-
-DEB_PKG_VERSION = $(shell echo $(MOZ_APP_VERSION) | $(PERL) -pe 's/pre/~$(GRE_BUILDID)/; s/^([0-9.]+)([a-z][0-9]+)/$$1~$$2/')
-
-DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-# package name should match mobile/installer/debian/changelog.in
-DEB_PKG_NAME = $(MOZ_PKG_APPNAME)_$(DEB_PKG_VERSION)_$(DEB_BUILD_ARCH).deb
-
-DEFINES += \
-	-DGRE_MILESTONE=$(GRE_MILESTONE) \
-	-DGRE_BUILDID=$(GRE_BUILDID) \
-	-Dinstalldir=$(installdir) \
-	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-	-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
-	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-	-DABS_OBJDIR=$(ABS_OBJDIR) \
-	-DBASE64_ICON=$(BASE64_ICON) \
-	-DMOZ_DEB_TIMESTAMP=$(MOZ_DEB_TIMESTAMP) \
-	-DDEB_PKG_VERSION=$(DEB_PKG_VERSION) \
-	$(NULL)
-
-NO_PKG_FILES = \
-	$(MOZ_APP_NAME)-config \
-	$(MOZ_APP_NAME)-bin.elf \
-	xulrunner-config \
-	$(MOZ_APP_NAME)-bin$(BIN_SUFFIX) \
-	nspr-config \
-	regchrome* \
-	regxpcom* \
-	xpcshell* \
-	xpidl* \
-	xpt_dump* \
-	xpt_link* \
-	bloaturls.txt \
-	nsinstall \
-	*Test* \
-	*test* \
-	BadPlugin* \
-	GoodPlugin* \
-	ReadNTLM* \
-	ShowSSEConfig* \
-	SimpleTypeLib* \
-	WriteArgument* \
-	grabpage* \
-	js.exe \
-	js \
-	nsIFileEnumerator* \
-	proxy-create-threadsafety* \
-	rdfcat* \
-	rdfpoll* \
-	$(NULL)
-
-ifndef SYSTEM_LIBXUL
-NO_PKG_FILES += xulrunner
-endif
-
 # overwrite mobile-l10n.js with a matchOS=true one for multi-locale builds
 ifeq ($(AB_CD),multi)
 PREF_JS_EXPORTS = $(srcdir)/mobile-l10n.js
@@ -111,6 +50,52 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
+MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
+
+ifdef MOZ_ENABLE_LIBXUL
+MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+else
+define message
+You need to build with --enable-libxul (the default, unless you specify
+--disable-libxul or --enable-shared or --enable-debug) to package a build.
+endef
+default libs installer::
+	$(error $(message))
+endif
+
+MOZ_NONLOCALIZED_PKG_LIST = \
+	xpcom \
+	browser \
+	mobile \
+	$(NULL)
+
+MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
+
+DEFINES += \
+	-DAB_CD=$(AB_CD) \
+	-DBINPATH=bin \
+	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
+	-DPREF_DIR=$(PREF_DIR) \
+	$(NULL)
+
+ifeq ($(MOZ_CHROME_FILE_FORMAT),jar)
+DEFINES += -DJAREXT=.jar
+else
+DEFINES += -DJAREXT=
+endif
+
+include $(topsrcdir)/ipc/app/defs.mk
+DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
+
+ifdef MOZ_PKG_MANIFEST_P
+MOZ_PKG_MANIFEST = package-manifest
+
+$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
+	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
+
+GARBAGE += $(MOZ_PKG_MANIFEST)
+endif
+
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 _BINPATH = /$(_APPNAME)/Contents/Resources
 endif
@@ -125,8 +110,6 @@ endif
 
 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 
-DEBDESTDIR=debian/$(MOZ_APP_NAME)
-
 ifdef LIBXUL_SDK
 MOZ_GRE_PKG_DIR=$(MOZ_PKG_DIR)/xulrunner
 else
@@ -148,6 +131,33 @@ endif
 endif
 
 ifeq ($(OS_TARGET),Linux)
+GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
+GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
+ABS_OBJDIR=`cd $(DEPTH); pwd`
+ABS_TOPSRCDIR=$(shell cd $(topsrcdir); pwd)
+BASE64_ICON = dist/branding/fennec_maemo_icon26.txt
+MOZ_DEB_TIMESTAMP = "$(shell date  +"%a, %d  %b %Y %T %z" )"
+
+DEB_PKG_VERSION = $(shell echo $(MOZ_APP_VERSION) | $(PERL) -pe 's/pre/~$(GRE_BUILDID)/; s/^([0-9.]+)([a-z][0-9]+)/$$1~$$2/')
+
+DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+# package name should match mobile/installer/debian/changelog.in
+DEB_PKG_NAME = $(MOZ_PKG_APPNAME)_$(DEB_PKG_VERSION)_$(DEB_BUILD_ARCH).deb
+
+DEFINES += \
+	-DGRE_MILESTONE=$(GRE_MILESTONE) \
+	-DGRE_BUILDID=$(GRE_BUILDID) \
+	-Dinstalldir=$(installdir) \
+	-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
+	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+	-DABS_OBJDIR=$(ABS_OBJDIR) \
+	-DBASE64_ICON=$(BASE64_ICON) \
+	-DMOZ_DEB_TIMESTAMP=$(MOZ_DEB_TIMESTAMP) \
+	-DDEB_PKG_VERSION=$(DEB_PKG_VERSION) \
+	$(NULL)
+
+DEBDESTDIR=debian/$(MOZ_APP_NAME)
+
 PP_DEB_FILES =	debian/control \
 		debian/changelog \
 		debian/$(MOZ_APP_NAME).desktop \
diff --git a/mobile/installer/package-manifest.in b/mobile/installer/package-manifest.in
new file mode 100644
index 000000000000..a289ed55b3ba
--- /dev/null
+++ b/mobile/installer/package-manifest.in
@@ -0,0 +1,620 @@
+; Package file for the Fennec build. 
+;
+; File format:
+;
+; [] designates a toplevel component. Example: [xpcom]
+; - in front of a file specifies it to be removed from the destination
+; * wildcard support to recursively copy the entire directory
+; ; file comment
+;
+
+#filter substitution
+
+#ifdef XP_MACOSX
+; Mac bundle stuff
+@APPNAME@/Contents/Info.plist
+@APPNAME@/Contents/PkgInfo
+@APPNAME@/Contents/Plug-Ins/
+@APPNAME@/Contents/Resources/
+#endif
+
+[@AB_CD@]
+@BINPATH@/chrome/@AB_CD@@JAREXT@
+@BINPATH@/chrome/@AB_CD@.manifest
+@BINPATH@/@PREF_DIR@/mobile-l10n.js
+@BINPATH@/searchplugins/*
+@BINPATH@/defaults/profile/bookmarks.html
+@BINPATH@/defaults/profile/localstore.rdf
+@BINPATH@/defaults/profile/mimeTypes.rdf
+@BINPATH@/defaults/profile/chrome/*
+@BINPATH@/update.locale
+@BINPATH@/updater.ini
+@BINPATH@/dictionaries/*
+#ifdef XP_WIN32
+#ifndef WINCE
+@BINPATH@/uninstall/helper.exe
+#endif
+#endif
+
+[xpcom]
+@BINPATH@/dependentlibs.list
+#ifndef MOZ_STATIC_JS
+@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+#endif
+@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
+#ifdef XP_MACOSX
+@BINPATH@/XUL
+#else
+@BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
+#endif
+#ifdef MOZ_IPC
+#ifdef XP_MACOSX
+@BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
+#else
+@BINPATH@/@MOZ_CHILD_PROCESS_NAME@
+#endif
+#endif
+#ifdef WINCE
+@BINPATH@/mozce_shunt.dll
+#elifdef XP_WIN32
+#ifndef MOZ_MEMORY
+#if _MSC_VER == 1400
+@BINPATH@/Microsoft.VC80.CRT.manifest
+@BINPATH@/msvcm80.dll
+@BINPATH@/msvcp80.dll
+@BINPATH@/msvcr80.dll
+#elif _MSC_VER == 1500
+@BINPATH@/Microsoft.VC90.CRT.manifest
+@BINPATH@/msvcm90.dll
+@BINPATH@/msvcp90.dll
+@BINPATH@/msvcr90.dll
+#elif _MSC_VER == 1600
+@BINPATH@/msvcp100.dll
+@BINPATH@/msvcr100.dll
+#endif
+#else
+@BINPATH@/mozcrt19.dll
+@BINPATH@/mozcpp19.dll
+#endif
+#endif
+#ifdef ANDROID
+@BINPATH@/AndroidManifest.xml
+@BINPATH@/resources.arsc
+@BINPATH@/classes.dex
+@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@
+@BINPATH@/res/drawable
+@BINPATH@/res/drawable-hdpi
+#endif
+
+[browser]
+; [Base Browser Files]
+#ifndef XP_UNIX
+@BINPATH@/@MOZ_APP_NAME@.exe
+#else
+@BINPATH@/@MOZ_APP_NAME@-bin
+@BINPATH@/@MOZ_APP_NAME@
+#endif
+@BINPATH@/application.ini
+@BINPATH@/platform.ini
+#ifndef XP_OS2
+@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
+#else
+@BINPATH@/mozsqlt3@DLL_SUFFIX@
+#endif
+@BINPATH@/README.txt
+@BINPATH@/blocklist.xml
+#ifdef XP_UNIX
+@BINPATH@/run-mozilla.sh
+#ifndef XP_MACOSX
+@BINPATH@/mozilla-xremote-client
+#endif
+#endif
+#ifdef MOZ_SPLASHSCREEN
+@BINPATH@/splash.bmp
+#endif
+
+; [Components]
+@BINPATH@/components/components.manifest
+@BINPATH@/components/alerts.xpt
+#ifdef ACCESSIBILITY
+#ifdef XP_WIN32
+@BINPATH@/AccessibleMarshal.dll
+@BINPATH@/components/accessibility-msaa.xpt
+#endif
+@BINPATH@/components/accessibility.xpt
+#endif
+@BINPATH@/components/appshell.xpt
+@BINPATH@/components/appstartup.xpt
+@BINPATH@/components/autocomplete.xpt
+@BINPATH@/components/autoconfig.xpt
+@BINPATH@/components/browsercompsbase.xpt
+@BINPATH@/components/browser-feeds.xpt
+@BINPATH@/components/caps.xpt
+@BINPATH@/components/chardet.xpt
+@BINPATH@/components/chrome.xpt
+@BINPATH@/components/commandhandler.xpt
+@BINPATH@/components/commandlines.xpt
+@BINPATH@/components/composer.xpt
+@BINPATH@/components/content_base.xpt
+@BINPATH@/components/content_events.xpt
+@BINPATH@/components/content_canvas.xpt
+@BINPATH@/components/content_htmldoc.xpt
+@BINPATH@/components/content_html.xpt
+@BINPATH@/components/content_xmldoc.xpt
+@BINPATH@/components/content_xslt.xpt
+@BINPATH@/components/content_xtf.xpt
+@BINPATH@/components/cookie.xpt
+@BINPATH@/components/directory.xpt
+@BINPATH@/components/docshell.xpt
+@BINPATH@/components/dom.xpt
+@BINPATH@/components/dom_base.xpt
+@BINPATH@/components/dom_canvas.xpt
+@BINPATH@/components/dom_core.xpt
+@BINPATH@/components/dom_css.xpt
+@BINPATH@/components/dom_events.xpt
+@BINPATH@/components/dom_geolocation.xpt
+@BINPATH@/components/dom_notification.xpt
+@BINPATH@/components/dom_html.xpt
+@BINPATH@/components/dom_indexeddb.xpt
+@BINPATH@/components/dom_offline.xpt
+@BINPATH@/components/dom_json.xpt
+@BINPATH@/components/dom_range.xpt
+@BINPATH@/components/dom_sidebar.xpt
+@BINPATH@/components/dom_storage.xpt
+@BINPATH@/components/dom_stylesheets.xpt
+@BINPATH@/components/dom_threads.xpt
+@BINPATH@/components/dom_traversal.xpt
+@BINPATH@/components/dom_views.xpt
+@BINPATH@/components/dom_xbl.xpt
+@BINPATH@/components/dom_xpath.xpt
+@BINPATH@/components/dom_xul.xpt
+@BINPATH@/components/dom_loadsave.xpt
+@BINPATH@/components/downloads.xpt
+@BINPATH@/components/editor.xpt
+@BINPATH@/components/embed_base.xpt
+@BINPATH@/components/extensions.xpt
+@BINPATH@/components/exthandler.xpt
+@BINPATH@/components/exthelper.xpt
+@BINPATH@/components/fastfind.xpt
+@BINPATH@/components/feeds.xpt
+#ifdef MOZ_GTK2
+@BINPATH@/components/filepicker.xpt
+#endif
+@BINPATH@/components/find.xpt
+@BINPATH@/components/fuel.xpt
+@BINPATH@/components/gfx.xpt
+@BINPATH@/components/htmlparser.xpt
+@BINPATH@/components/imglib2.xpt
+@BINPATH@/components/imgicon.xpt
+@BINPATH@/components/inspector.xpt
+@BINPATH@/components/intl.xpt
+@BINPATH@/components/jar.xpt
+@BINPATH@/components/jetpack.xpt
+@BINPATH@/components/jsdservice.xpt
+@BINPATH@/components/layout_base.xpt
+@BINPATH@/components/layout_forms.xpt
+#ifdef NS_PRINTING
+@BINPATH@/components/layout_printing.xpt
+#endif
+@BINPATH@/components/layout_xul_tree.xpt
+@BINPATH@/components/layout_xul.xpt
+@BINPATH@/components/locale.xpt
+@BINPATH@/components/lwbrk.xpt
+#ifndef WINCE
+@BINPATH@/components/migration.xpt
+#endif
+@BINPATH@/components/mimetype.xpt
+@BINPATH@/components/mozfind.xpt
+@BINPATH@/components/necko_about.xpt
+@BINPATH@/components/necko_cache.xpt
+@BINPATH@/components/necko_cookie.xpt
+@BINPATH@/components/necko_dns.xpt
+@BINPATH@/components/necko_file.xpt
+@BINPATH@/components/necko_ftp.xpt
+@BINPATH@/components/necko_http.xpt
+@BINPATH@/components/necko_res.xpt
+@BINPATH@/components/necko_socket.xpt
+@BINPATH@/components/necko_strconv.xpt
+@BINPATH@/components/necko_viewsource.xpt
+@BINPATH@/components/necko_wifi.xpt
+@BINPATH@/components/necko.xpt
+@BINPATH@/components/loginmgr.xpt
+@BINPATH@/components/parentalcontrols.xpt
+@BINPATH@/components/places.xpt
+@BINPATH@/components/plugin.xpt
+@BINPATH@/components/pref.xpt
+@BINPATH@/components/prefetch.xpt
+@BINPATH@/components/profile.xpt
+@BINPATH@/components/proxyObject.xpt
+@BINPATH@/components/rdf.xpt
+@BINPATH@/components/satchel.xpt
+@BINPATH@/components/saxparser.xpt
+@BINPATH@/components/sessionstore.xpt
+#ifdef MOZ_SERVICES_SYNC
+@BINPATH@/components/services-crypto.xpt
+#endif
+@BINPATH@/components/shellservice.xpt
+@BINPATH@/components/shistory.xpt
+@BINPATH@/components/spellchecker.xpt
+@BINPATH@/components/storage.xpt
+@BINPATH@/components/toolkitprofile.xpt
+#ifdef MOZ_ENABLE_XREMOTE
+@BINPATH@/components/toolkitremote.xpt
+#endif
+@BINPATH@/components/txtsvc.xpt
+@BINPATH@/components/txmgr.xpt
+#ifdef MOZ_USE_NATIVE_UCONV
+@BINPATH@/components/ucnative.xpt
+#endif
+@BINPATH@/components/uconv.xpt
+@BINPATH@/components/unicharutil.xpt
+@BINPATH@/components/update.xpt
+@BINPATH@/components/uriloader.xpt
+@BINPATH@/components/urlformatter.xpt
+@BINPATH@/components/webBrowser_core.xpt
+@BINPATH@/components/webbrowserpersist.xpt
+@BINPATH@/components/webshell_idls.xpt
+@BINPATH@/components/widget.xpt
+#ifdef XP_MACOSX
+@BINPATH@/components/widget_cocoa.xpt
+#endif
+@BINPATH@/components/windowds.xpt
+@BINPATH@/components/windowwatcher.xpt
+@BINPATH@/components/xpcom_base.xpt
+@BINPATH@/components/xpcom_system.xpt
+@BINPATH@/components/xpcom_components.xpt
+@BINPATH@/components/xpcom_ds.xpt
+@BINPATH@/components/xpcom_io.xpt
+@BINPATH@/components/xpcom_threads.xpt
+@BINPATH@/components/xpcom_xpti.xpt
+@BINPATH@/components/xpconnect.xpt
+@BINPATH@/components/xulapp.xpt
+@BINPATH@/components/xuldoc.xpt
+@BINPATH@/components/xultmpl.xpt
+@BINPATH@/components/zipwriter.xpt
+
+; JavaScript components
+@BINPATH@/components/FeedProcessor.manifest
+@BINPATH@/components/FeedProcessor.js
+@BINPATH@/components/BrowserFeeds.manifest
+@BINPATH@/components/FeedConverter.js
+@BINPATH@/components/FeedWriter.js
+@BINPATH@/components/fuelApplication.manifest
+@BINPATH@/components/fuelApplication.js
+@BINPATH@/components/WebContentConverter.js
+@BINPATH@/components/BrowserComponents.manifest
+@BINPATH@/components/nsBrowserContentHandler.js
+@BINPATH@/components/nsBrowserGlue.js
+@BINPATH@/components/nsSetDefaultBrowser.manifest
+@BINPATH@/components/nsSetDefaultBrowser.js
+@BINPATH@/components/nsMicrosummaryService.js
+@BINPATH@/components/BrowserPlaces.manifest
+@BINPATH@/components/nsPrivateBrowsingService.manifest
+@BINPATH@/components/nsPrivateBrowsingService.js
+@BINPATH@/components/toolkitsearch.manifest
+@BINPATH@/components/nsSearchService.js
+@BINPATH@/components/nsSearchSuggestions.js
+@BINPATH@/components/nsTryToClose.manifest
+@BINPATH@/components/nsTryToClose.js
+@BINPATH@/components/passwordmgr.manifest
+@BINPATH@/components/nsLoginInfo.js
+@BINPATH@/components/nsLoginManager.js
+@BINPATH@/components/nsLoginManagerPrompter.js
+@BINPATH@/components/storage-Legacy.js
+@BINPATH@/components/storage-mozStorage.js
+@BINPATH@/components/crypto-SDR.js
+@BINPATH@/components/jsconsole-clhandler.manifest
+@BINPATH@/components/jsconsole-clhandler.js
+#ifdef MOZ_GTK2
+@BINPATH@/components/nsFilePicker.manifest
+@BINPATH@/components/nsFilePicker.js
+#endif
+@BINPATH@/components/nsHelperAppDlg.manifest
+@BINPATH@/components/nsHelperAppDlg.js
+@BINPATH@/components/nsDownloadManagerUI.manifest
+@BINPATH@/components/nsDownloadManagerUI.js
+@BINPATH@/components/nsProxyAutoConfig.manifest
+@BINPATH@/components/nsProxyAutoConfig.js
+@BINPATH@/components/NetworkGeolocationProvider.manifest
+@BINPATH@/components/NetworkGeolocationProvider.js
+@BINPATH@/components/GPSDGeolocationProvider.manifest
+@BINPATH@/components/GPSDGeolocationProvider.js
+@BINPATH@/components/nsSidebar.manifest
+@BINPATH@/components/nsSidebar.js
+@BINPATH@/components/extensions.manifest
+@BINPATH@/components/addonManager.js
+@BINPATH@/components/amContentHandler.js
+@BINPATH@/components/amWebInstallListener.js
+@BINPATH@/components/nsBlocklistService.js
+#ifdef MOZ_UPDATER
+@BINPATH@/components/nsUpdateService.manifest
+@BINPATH@/components/nsUpdateService.js
+@BINPATH@/components/nsUpdateServiceStub.js
+#endif
+@BINPATH@/components/nsUpdateTimerManager.manifest
+@BINPATH@/components/nsUpdateTimerManager.js
+@BINPATH@/components/pluginGlue.manifest
+@BINPATH@/components/nsSessionStore.manifest
+@BINPATH@/components/nsSessionStartup.js
+@BINPATH@/components/nsSessionStore.js
+@BINPATH@/components/nsURLFormatter.manifest
+@BINPATH@/components/nsURLFormatter.js
+#ifndef XP_OS2
+@BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
+#else
+@BINPATH@/components/brwsrcmp@DLL_SUFFIX@
+#endif
+@BINPATH@/components/txEXSLTRegExFunctions.manifest
+@BINPATH@/components/txEXSLTRegExFunctions.js
+@BINPATH@/components/toolkitplaces.manifest
+@BINPATH@/components/nsLivemarkService.js
+@BINPATH@/components/nsTaggingService.js
+@BINPATH@/components/nsPlacesDBFlush.js
+@BINPATH@/components/nsPlacesAutoComplete.manifest
+@BINPATH@/components/nsPlacesAutoComplete.js
+@BINPATH@/components/nsPlacesExpiration.js
+@BINPATH@/components/PlacesProtocolHandler.js
+@BINPATH@/components/nsDefaultCLH.manifest
+@BINPATH@/components/nsDefaultCLH.js
+@BINPATH@/components/nsContentPrefService.manifest
+@BINPATH@/components/nsContentPrefService.js
+@BINPATH@/components/nsContentDispatchChooser.manifest
+@BINPATH@/components/nsContentDispatchChooser.js
+@BINPATH@/components/nsHandlerService.manifest
+@BINPATH@/components/nsHandlerService.js
+@BINPATH@/components/nsWebHandlerApp.manifest
+@BINPATH@/components/nsWebHandlerApp.js
+@BINPATH@/components/nsBadCertHandler.manifest
+@BINPATH@/components/nsBadCertHandler.js
+@BINPATH@/components/satchel.manifest
+@BINPATH@/components/nsFormAutoComplete.js
+@BINPATH@/components/nsFormHistory.js
+@BINPATH@/components/nsInputListAutoComplete.js
+@BINPATH@/components/contentSecurityPolicy.manifest
+@BINPATH@/components/contentSecurityPolicy.js
+@BINPATH@/components/contentAreaDropListener.manifest
+@BINPATH@/components/contentAreaDropListener.js
+@BINPATH@/components/messageWakeupService.js
+@BINPATH@/components/messageWakeupService.manifest
+@BINPATH@/components/nsFilePicker.js
+@BINPATH@/components/nsFilePicker.manifest
+#ifdef XP_MACOSX
+@BINPATH@/components/libalerts_s.dylib
+#endif
+#ifdef MOZ_ENABLE_DBUS
+@BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
+#endif
+@BINPATH@/components/nsINIProcessor.manifest
+@BINPATH@/components/nsINIProcessor.js
+@BINPATH@/components/nsPrompter.manifest
+@BINPATH@/components/nsPrompter.js
+#ifdef MOZ_SERVICES_SYNC
+@BINPATH@/components/SyncComponents.manifest
+@BINPATH@/components/Weave.js
+@BINPATH@/components/WeaveCrypto.manifest
+@BINPATH@/components/WeaveCrypto.js
+#endif
+
+; Modules
+@BINPATH@/modules/*
+
+; Safe Browsing
+@BINPATH@/components/nsSafebrowsingApplication.manifest
+@BINPATH@/components/nsSafebrowsingApplication.js
+@BINPATH@/components/nsURLClassifier.manifest
+@BINPATH@/components/nsUrlClassifierListManager.js
+@BINPATH@/components/nsUrlClassifierLib.js
+@BINPATH@/components/url-classifier.xpt
+
+; GNOME hooks
+#ifdef MOZ_ENABLE_GNOME_COMPONENT
+@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
+#endif
+
+; [Browser Chrome Files]
+@BINPATH@/chrome/browser@JAREXT@
+@BINPATH@/chrome/browser.manifest
+@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
+#if MOZ_UPDATE_CHANNEL == beta
+@BINPATH@/extensions/testpilot@labs.mozilla.com/*
+#endif
+@BINPATH@/chrome/toolkit@JAREXT@
+@BINPATH@/chrome/toolkit.manifest
+#ifdef XP_UNIX
+#ifndef XP_MACOSX
+@BINPATH@/chrome/icons/default/default16.png
+@BINPATH@/chrome/icons/default/default32.png
+@BINPATH@/chrome/icons/default/default48.png
+#endif
+#endif
+
+
+; shell icons
+#ifdef XP_UNIX
+#ifndef XP_MACOSX
+@BINPATH@/icons/*.xpm
+@BINPATH@/icons/*.png
+#endif
+#endif
+
+; [Default Preferences]
+; All the pref files must be part of base to prevent migration bugs
+@BINPATH@/@PREF_DIR@/mobile.js
+@BINPATH@/@PREF_DIR@/mobile-branding.js
+@BINPATH@/@PREF_DIR@/channel-prefs.js
+#ifdef MOZ_SERVICES_SYNC
+@BINPATH@/@PREF_DIR@/services-sync.js
+#endif
+@BINPATH@/greprefs.js
+@BINPATH@/defaults/autoconfig/platform.js
+@BINPATH@/defaults/autoconfig/prefcalls.js
+@BINPATH@/defaults/profile/prefs.js
+
+; [Layout Engine Resources]
+; Style Sheets, Graphics and other Resources used by the layout engine. 
+@BINPATH@/res/EditorOverride.css
+@BINPATH@/res/contenteditable.css
+@BINPATH@/res/designmode.css
+@BINPATH@/res/table-add-column-after-active.gif
+@BINPATH@/res/table-add-column-after-hover.gif
+@BINPATH@/res/table-add-column-after.gif
+@BINPATH@/res/table-add-column-before-active.gif
+@BINPATH@/res/table-add-column-before-hover.gif
+@BINPATH@/res/table-add-column-before.gif
+@BINPATH@/res/table-add-row-after-active.gif
+@BINPATH@/res/table-add-row-after-hover.gif
+@BINPATH@/res/table-add-row-after.gif
+@BINPATH@/res/table-add-row-before-active.gif
+@BINPATH@/res/table-add-row-before-hover.gif
+@BINPATH@/res/table-add-row-before.gif
+@BINPATH@/res/table-remove-column-active.gif
+@BINPATH@/res/table-remove-column-hover.gif
+@BINPATH@/res/table-remove-column.gif
+@BINPATH@/res/table-remove-row-active.gif
+@BINPATH@/res/table-remove-row-hover.gif
+@BINPATH@/res/table-remove-row.gif
+@BINPATH@/res/grabber.gif
+#ifdef XP_MACOSX
+@BINPATH@/res/cursors/*
+#endif
+@BINPATH@/res/fonts/*
+@BINPATH@/res/dtd/*
+@BINPATH@/res/html/*
+@BINPATH@/res/langGroups.properties
+@BINPATH@/res/language.properties
+@BINPATH@/res/entityTables/*
+#ifdef XP_MACOSX
+@BINPATH@/res/MainMenu.nib/
+#endif
+
+; svg
+@BINPATH@/res/svg.css
+@BINPATH@/components/dom_svg.xpt
+#ifdef MOZ_SMIL
+@BINPATH@/components/dom_smil.xpt
+#endif
+
+; [Personal Security Manager]
+;
+@BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
+@BINPATH@/components/pipboot.xpt
+@BINPATH@/components/pipnss.xpt
+@BINPATH@/components/pippki.xpt
+@BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
+@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
+#ifndef CROSS_COMPILE
+@BINPATH@/@DLL_PREFIX@freebl3.chk
+@BINPATH@/@DLL_PREFIX@softokn3.chk
+#endif
+#ifndef NSS_DISABLE_DBM
+@BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
+#ifndef CROSS_COMPILE
+@BINPATH@/@DLL_PREFIX@nssdbm3.chk
+#endif
+#endif
+@BINPATH@/chrome/pippki@JAREXT@
+@BINPATH@/chrome/pippki.manifest
+
+; for Solaris SPARC
+#ifdef SOLARIS
+bin/libfreebl_32fpu_3.chk
+bin/libfreebl_32fpu_3.so
+bin/libfreebl_32int_3.chk
+bin/libfreebl_32int_3.so
+bin/libfreebl_32int64_3.chk
+bin/libfreebl_32int64_3.so
+#endif
+
+; [Updater]
+;
+#ifdef XP_MACOSX
+@BINPATH@/updater.app/
+#else
+@BINPATH@/updater@BIN_SUFFIX@
+#endif
+
+; [Crash Reporter]
+;
+#ifdef MOZ_CRASHREPORTER
+#ifdef XP_MACOSX
+@BINPATH@/crashreporter.app/
+#else
+@BINPATH@/crashreporter@BIN_SUFFIX@
+@BINPATH@/crashreporter.ini
+#ifdef XP_UNIX
+@BINPATH@/Throbber-small.gif
+#endif
+#endif
+@BINPATH@/crashreporter-override.ini
+#endif
+
+; [Extensions]
+;
+#ifdef MOZ_ENABLE_GNOMEVFS
+bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
+#endif
+
+; [ActiveX]
+#ifdef WINCE
+#ifndef MOZ_NO_ACTIVEX_SUPPORT
+@BINPATH@/components/nsAxSecurityPolicy.js
+@BINPATH@/@PREF_DIR@/activex.js
+@BINPATH@/plugins/npmozax.dll
+@BINPATH@/plugins/nsIMozAxPlugin.xpt
+#endif
+#endif
+
+; [FastStart]
+#ifdef WINCE
+#ifdef MOZ_FASTSTART
+@BINPATH@/firefoxfaststart.exe
+@BINPATH@/components/FastStartup.manifest
+@BINPATH@/components/FastStartup.js
+#endif
+#endif
+
+; [OS/2]
+#ifdef XP_OS2
+@BINPATH@/MozSounds.cmd
+#endif
+
+[mobile]
+@BINPATH@/chrome/icons/
+@BINPATH@/chrome/chrome@JAREXT@
+@BINPATH@/chrome/chrome.manifest
+@BINPATH@/components/AboutRedirector.js
+@BINPATH@/components/AddonUpdateService.js
+@BINPATH@/components/AlertsService.js
+@BINPATH@/components/AutoCompleteCache.js
+@BINPATH@/components/BlocklistPrompt.js
+@BINPATH@/components/BrowserCLH.js
+@BINPATH@/components/BrowserStartup.js
+@BINPATH@/components/ContentDispatchChooser.js
+@BINPATH@/components/ContentPermissionPrompt.js
+@BINPATH@/components/DirectoryProvider.js
+@BINPATH@/components/DownloadManagerUI.js
+@BINPATH@/components/FormAutoComplete.js
+@BINPATH@/components/HelperAppDialog.js
+@BINPATH@/components/LoginManager.js
+@BINPATH@/components/LoginManagerPrompter.idl
+@BINPATH@/components/LoginManagerPrompter.js
+@BINPATH@/components/MobileComponents.manifest
+@BINPATH@/components/PromptService.js
+@BINPATH@/components/SessionStore.idl
+@BINPATH@/components/SessionStore.js
+@BINPATH@/components/Sidebar.js
+@BINPATH@/components/UpdatePrompt.js
+@BINPATH@/components/XPIDialogService.js
+@BINPATH@/components/libmozgnome.so
+@BINPATH@/components/libmozphone.so
+@BINPATH@/extensions/
diff --git a/mobile/installer/removed-files.in b/mobile/installer/removed-files.in
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/mobile/locales/Makefile.in b/mobile/locales/Makefile.in
index e6c51b449322..249b76fdd430 100644
--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -247,3 +247,10 @@ ifndef DEB_PKG_NAME
 	$(error DEB_PKG_NAME not defined)
 endif
 	@$(MAKE) repackage-deb AB_CD=$(AB_CD) DEB_PKG_NAME=$(DEB_PKG_NAME)
+
+merge-%:
+ifdef LOCALE_MERGEDIR
+	$(RM) -rf $(LOCALE_MERGEDIR)
+	MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
+endif
+	@echo