--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -9,16 +9,23 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+# XXX Bug 835309 - this causes errors on Mac currently
+ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+# Some files have been already bundled with xulrunner
+ifndef SYSTEM_LIBXUL
+MOZ_PKG_FATAL_WARNINGS = 1
+endif
+endif
 
 MOZ_NONLOCALIZED_PKG_LIST = \
 	xpcom \
 	mail \
 	newsblog \
 	offline \
 	$(NULL)
 
@@ -46,16 +53,20 @@ endif
 
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
 include $(MOZILLA_SRCDIR)/ipc/app/defs.mk
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
+ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
+DEFINES += -DMOZ_SHARED_MOZGLUE=1
+endif
+
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = package-manifest
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
 	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))

--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -71,18 +71,19 @@
 @BINPATH@/msvcp100.dll
 @BINPATH@/msvcr100.dll
 #elif _MSC_VER == 1700
 @BINPATH@/msvcp110.dll
 @BINPATH@/msvcr110.dll
 #endif
 #endif
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@soundtouch@DLL_SUFFIX@
+#ifdef MOZ_SHARED_MOZGLUE
 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
+#endif
 #ifdef XP_MACOSX
 @BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
 @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
@@ -139,28 +140,29 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 @BINPATH@/defaults/messenger/mailViews.dat
 @BINPATH@/defaults/profile/localstore.rdf
 @BINPATH@/defaults/profile/prefs.js
 @BINPATH@/defaults/profile/mimeTypes.rdf
 
 @BINPATH@/isp/*
 
+#ifndef XP_WIN
 @BINPATH@/components/components.manifest
+#endif
 @BINPATH@/components/aboutRedirector.js
 @BINPATH@/components/activity.xpt
 @BINPATH@/components/activityComponents.manifest
 @BINPATH@/components/cloudFileComponents.manifest
 @BINPATH@/components/cloudfile.xpt
 @BINPATH@/components/addrbook.xpt
 @BINPATH@/components/fts3tok.xpt
 ; interfaces.manifest doesn't get packaged because it is dynamically
 ; re-created at packaging time when linking the xpts that will actually
 ; go into the package, so the test related interfaces aren't included.
-@BINPATH@/components/jetpack.xpt
 @BINPATH@/components/mime.xpt
 @BINPATH@/components/mimeJSComponents.js
 @BINPATH@/components/msgMime.manifest
 @BINPATH@/components/steel.xpt
 @BINPATH@/components/msgAsyncPrompter.js
 @BINPATH@/components/msgbase.xpt
 @BINPATH@/components/msgBase.manifest
 @BINPATH@/components/msgcompose.xpt
@@ -176,17 +178,16 @@
 @BINPATH@/components/messageWakeupService.js
 @BINPATH@/components/messageWakeupService.manifest
 @BINPATH@/components/nsActivity.js
 @BINPATH@/components/nsActivityManager.js
 @BINPATH@/components/nsActivityManagerUI.js
 @BINPATH@/components/nsYouSendIt.js
 @BINPATH@/components/nsUbuntuOne.js
 @BINPATH@/components/nsBox.js
-@BINPATH@/components/cloudFileAccounts.js
 @BINPATH@/components/nsAddrbook.manifest
 @BINPATH@/components/nsMailNewsCommandLineHandler.js
 @BINPATH@/components/services-crypto-component.xpt
 #ifndef XP_OS2
 @BINPATH@/components/shellservice.xpt
 #endif
 @BINPATH@/components/xpcom_base.xpt
 @BINPATH@/components/xpcom_system.xpt
@@ -530,17 +531,17 @@
 @BINPATH@/components/dom_events.xpt
 @BINPATH@/components/dom_geolocation.xpt
 @BINPATH@/components/dom_html.xpt
 @BINPATH@/components/dom_indexeddb.xpt
 @BINPATH@/components/dom_json.xpt
 @BINPATH@/components/dom_network.xpt
 @BINPATH@/components/dom_notification.xpt
 @BINPATH@/components/dom_offline.xpt
-@BINPATH@/componnets/dom_power.xpt
+@BINPATH@/components/dom_power.xpt
 @BINPATH@/components/dom_range.xpt
 @BINPATH@/components/dom_sidebar.xpt
 @BINPATH@/components/dom_sms.xpt
 @BINPATH@/components/dom_smil.xpt
 @BINPATH@/components/dom_storage.xpt
 @BINPATH@/components/dom_stylesheets.xpt
 @BINPATH@/components/dom_system.xpt
 @BINPATH@/components/dom_traversal.xpt
@@ -638,17 +639,16 @@
 @BINPATH@/components/xpautocomplete.xpt
 @BINPATH@/components/autocomplete.xpt
 @BINPATH@/components/alerts.xpt
 @BINPATH@/components/jsdebugger.xpt
 @BINPATH@/components/jsdservice.xpt
 @BINPATH@/components/jsinspector.xpt
 @BINPATH@/components/fastfind.xpt
 @BINPATH@/components/find.xpt
-@BINPATH@/components/chardet.xpt
 @BINPATH@/components/ConsoleAPI.js
 @BINPATH@/components/ConsoleAPI.manifest
 @BINPATH@/components/ContactManager.js
 @BINPATH@/components/ContactManager.manifest
 @BINPATH@/components/contentAreaDropListener.js
 @BINPATH@/components/contentAreaDropListener.manifest
 @BINPATH@/components/contentSecurityPolicy.js
 @BINPATH@/components/contentSecurityPolicy.manifest

--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -39,16 +39,17 @@ chrome/US.jar
   #endif
 #endif
 components/accessibility-atk.xpt
 components/airbag.xpt
 #ifdef XP_MACOSX
   components/libalerts_s.dylib
 #endif
 components/bookmarks.xpt
+components/chardet.xpt
 components/downloadmanager.xpt
 components/compreg.dat
 components/components.list
 components/history.xpt
 components/jsconsole.xpt
 components/layout.xpt
 components/mailnews.xpt
 components/mozgnome.xpt
@@ -894,17 +895,16 @@ components/xmlextras.xpt
 #ifdef XP_WIN
   components/accessibility-msaa.xpt
   components/accessibility.xpt
   components/addrbook.xpt
   components/alerts.xpt
   components/appshell.xpt
   components/autocomplete.xpt
   components/caps.xpt
-  components/chardet.xpt
   components/chrome.xpt
   components/commandhandler.xpt
   components/composer.xpt
   components/content_base.xpt
   components/content_html.xpt
   components/content_htmldoc.xpt
   components/content_xmldoc.xpt
   components/content_xslt.xpt
@@ -1024,17 +1024,16 @@ components/xmlextras.xpt
   components/activity.xpt
   components/addrbook.xpt
   components/alerts.xpt
   components/appshell.xpt
   components/appstartup.xpt
   components/autocomplete.xpt
   components/autoconfig.xpt
   components/caps.xpt
-  components/chardet.xpt
   components/chrome.xpt
   components/commandhandler.xpt
   components/commandlines.xpt
   components/composer.xpt
   components/content_base.xpt
   components/content_html.xpt
   components/content_htmldoc.xpt
   components/content_xmldoc.xpt