--- a/components/desktop/firefox/Makefile	Tue Oct 27 07:12:09 2015 -0700
+++ b/components/desktop/firefox/Makefile	Tue Jan 12 11:54:24 2016 -0800
@@ -49,20 +49,19 @@
 # There are a set of .xpi files (as given in the LANG_LIST definition below)
 # that we need. These are available under:
 # http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.8.0esr/linux-i686/xpi/
-# This downloads the xpi files.
+# We could download and unpack them individually, but instead I've created
+# a compressed tarball of them, and made that available locally for download.
+# Downloading them individually can be a problem because firefox/thunderbird 
+# collide due to different files with identical .xpi names.
+COMPONENT_ARCHIVE_1 =           firefox-31.8.0esr-xpi.tar.gz
+COMPONENT_ARCHIVE_HASH_1 = \
+    sha256:f4be660e98f4bfac9e8b1a5ba39f74dc201697fe857b4f7c5dd8f3204837df54
+COMPONENT_ARCHIVE_URL_1 =       $(INTERNAL_ARCHIVE_MIRROR)/source-archives/$(COMPONENT_ARCHIVE_1)
 
 LANG_LIST = ar be bg ca cs da de el es-AR es-CL es-ES et fi \
 	fr he hi-IN hr hu id is it ja kk ko lt lv mk nb-NO nl nn-NO \
 	pl pt-BR pt-PT ro ru sk sl sq sr sv-SE th tr uk vi zh-CN zh-TW
 
-COMPONENT_PREP_ACTION += \
-        ($(MKDIR) xpi ; \
-        cd xpi ; \
-        for l in $(LANG_LIST) ; do \
-                $(WS_TOOLS)/userland-fetch --file $$l.xpi --url $(MOZILLA_FTP)/linux-i686/xpi/ ; \
-        done ; )
-
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
@@ -131,6 +130,8 @@
 		$(PROTOUSRLIBDIR)/firefox-$(IPS_COMPONENT_VERSION)/precomplete ;
 
 COMPONENT_POST_INSTALL_ACTION += \
+        $(RM) -rf xpi ; \
+        /usr/bin/tar xvf $(COMPONENT_ARCHIVE_1) > /dev/null 2>&1 ; \
         list1='$(LANG_LIST)' ; for f in $$list1 ; do \
             $(CP) xpi/$$f.xpi \
                 $(PROTOUSRLIBDIR)/firefox-$(IPS_COMPONENT_VERSION)/browser/extensions/[email protected] ; \
@@ -169,7 +170,6 @@
 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
 REQUIRED_PACKAGES += library/desktop/gtk2
 REQUIRED_PACKAGES += library/desktop/pango
-REQUIRED_PACKAGES += library/desktop/startup-notification
 REQUIRED_PACKAGES += library/glib2
 REQUIRED_PACKAGES += library/graphics/pixman
 REQUIRED_PACKAGES += library/libevent

--- a/components/desktop/thunderbird/Makefile	Tue Oct 27 07:12:09 2015 -0700
+++ b/components/desktop/thunderbird/Makefile	Tue Jan 12 11:54:24 2016 -0800
@@ -47,19 +47,19 @@
 # There are a set of .xpi files (as given in the LANG_LIST definition below)
 # that we need. These are available under:
 # http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.6.0/linux-i686/xpi/
-# This downloads the xpis. 
+# We could download and unpack them individually, but instead I've created
+# a compressed tarball of them, and made that available locally for download.
+# Downloading them individually can be a problem because firefox/thunderbird 
+# collide due to different files with identical .xpi names. 
+COMPONENT_ARCHIVE_1 =   thunderbird-31.6.0-xpi.tar.gz
+COMPONENT_ARCHIVE_HASH_1 = \
+    sha256:80e9cc4b152d75f5c3887c01ad1767680aff5ca7c3aee87254bdc1574590b95e
+COMPONENT_ARCHIVE_URL_1 =       $(INTERNAL_ARCHIVE_MIRROR)/source-archives/$(COMPONENT_ARCHIVE_1)
 
 LANG_LIST = ar bg ca cs da de el es-AR es-ES et eu fi \
 	fr gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl \
 	pt-BR pt-PT ro ru sk sl sq sv-SE tr uk zh-CN zh-TW
 
-COMPONENT_PREP_ACTION += \
-        ($(MKDIR) xpi ; \
-        cd xpi ; \
-        for l in $(LANG_LIST) ; do \
-                $(WS_TOOLS)/userland-fetch --file $$l.xpi --url $(MOZILLA_FTP)/linux-i686/xpi/ ; \
-        done ; )
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
@@ -131,6 +131,8 @@
 		$(PROTOUSRLIBDIR)/thunderbird-$(COMPONENT_VERSION)/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} ;
 
 COMPONENT_POST_INSTALL_ACTION += \
+        $(RM) -rf xpi ; \
+        /usr/bin/tar xvf $(COMPONENT_ARCHIVE_1) > /dev/null 2>&1 ; \
         list1='$(LANG_LIST)' ; for f in $$list1 ; do \
             $(CP) xpi/$$f.xpi \
                 $(PROTOUSRLIBDIR)/thunderbird-$(COMPONENT_VERSION)/extensions/[email protected] ; \