--- a/Makefile.in
+++ b/Makefile.in
@@ -143,25 +143,25 @@ ifdef MOZ_AIRBAG
 	/bin/find . -path "./dist" -prune -o -name "*.exe"                \
           -o -name "*.dll" -o -name "*.EXE" | sed "s/\.[^\.]*$$/\.pdb/" | \
 	  xargs $(topsrcdir)/toolkit/airbag/tools/make_symbol_store.pl -c \
 	  $(topsrcdir)/toolkit/airbag/tools/win32/dump_syms.exe           \
 	  $(DIST)/airbag-symbols/$(BUILDID) >                             \
 	  $(DIST)/airbag-symbols/$(BUILDID)/$(BUILDID)-symbols.txt
 	echo packing symbols
 	mkdir -p $(topsrcdir)/../$(BUILDID)
-	cd $(DIST)/airbag-symbols/$(BUILDID) && tar -cvjf airbag-symbols-$(BUILDID).tar.bz2 *
-	mv $(DIST)/airbag-symbols/$(BUILDID)/airbag-symbols-$(BUILDID).tar.bz2 $(topsrcdir)/../$(BUILDID)
+	cd $(DIST)/airbag-symbols/$(BUILDID) && zip -r9D ../airbag-symbols-$(BUILDID).zip .
+	mv $(DIST)/airbag-symbols/airbag-symbols-$(BUILDID).zip $(topsrcdir)/../$(BUILDID)
 endif # MOZ_DEBUG_SYMBOLS
 endif # MOZ_AIRBAG
 
 uploadsymbols:
 ifdef MOZ_DEBUG_SYMBOLS
 ifdef MOZ_AIRBAG
-	$(topsrcdir)/toolkit/airbag/tools/upload_symbols.sh $(topsrcdir)/../$(BUILDID)/airbag-symbols-$(BUILDID).tar.bz2
+	$(topsrcdir)/toolkit/airbag/tools/upload_symbols.sh $(topsrcdir)/../$(BUILDID)/airbag-symbols-$(BUILDID).zip
 endif
 endif
 
 ## XXXvlad -- the test and cp should be removed once bug 249782 is
 ## completely fixed
 signnss:
 ifdef MOZILLA_OFFICIAL
 	echo signing NSS libs

--- a/toolkit/airbag/tools/upload_symbols.sh
+++ b/toolkit/airbag/tools/upload_symbols.sh
@@ -36,15 +36,21 @@
 #
 # ***** END LICENSE BLOCK *****
 #
 # This script expects the following environment variables to be set:
 # AIRBAG_SYMBOL_SERVER  : host to upload symbols to
 # AIRBAG_SYMBOL_USER    : username on that host
 # AIRBAG_SYMBOL_PATH    : path on that host to put symbols in
 #
+set -e
+
 : ${AIRBAG_SYMBOL_SERVER?} ${AIRBAG_SYMBOL_USER?} ${AIRBAG_SYMBOL_PATH?} ${1?"You must specify a symbol archive to upload"}
 archive=`basename $1`
 echo "Transferring symbols... $1"
-rsync -avvz -e "ssh -2" $1 ${AIRBAG_SYMBOL_USER}@${AIRBAG_SYMBOL_SERVER}:${AIRBAG_SYMBOL_PATH}/
+scp -v $1 ${AIRBAG_SYMBOL_USER}@${AIRBAG_SYMBOL_SERVER}:${AIRBAG_SYMBOL_PATH}/
 echo "Unpacking symbols on remote host..."
-ssh -2 -l ${AIRBAG_SYMBOL_USER} ${AIRBAG_SYMBOL_SERVER} "cd ${AIRBAG_SYMBOL_PATH}; tar -xvjf $archive; rm -fv $archive"
+ssh -2 -l ${AIRBAG_SYMBOL_USER} ${AIRBAG_SYMBOL_SERVER} \
+  "set -e;
+   cd ${AIRBAG_SYMBOL_PATH};
+   unzip $archive;
+   rm -v $archive;"
 echo "Symbol transfer completed"