diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in
index b9375f469c1..2770f52aeef 100644
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -175,6 +175,9 @@ endif
 SYMBOL_ARCHIVE_BASENAME = \
   $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_ARCH)-$(BUILDID)$(EXTRA_BUILDID)
 
+export SYMBOL_INDEX_NAME = \
+  $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)$(EXTRA_BUILDID)-symbols.txt
+
 buildsymbols:
 ifdef MOZ_CRASHREPORTER
 	echo building symbol store
diff --git a/mozilla/toolkit/crashreporter/tools/upload_symbols.sh b/mozilla/toolkit/crashreporter/tools/upload_symbols.sh
index 2bab4aceeb1..72cf1e4788a 100755
--- a/mozilla/toolkit/crashreporter/tools/upload_symbols.sh
+++ b/mozilla/toolkit/crashreporter/tools/upload_symbols.sh
@@ -44,6 +44,9 @@
 # And will use the following optional environment variables if set:
 # SYMBOL_SERVER_SSH_KEY : path to a ssh private key to use
 # SYMBOL_SERVER_PORT    : port to use for ssh
+# POST_SYMBOL_UPLOAD_CMD: a commandline to run on the remote host after
+#                         uploading. The full paths of the symbol index
+#                         file will be appended to the commandline.
 #
 set -e
 
@@ -62,4 +65,11 @@ ssh -2 ${SYMBOL_SERVER_PORT:+-p $SYMBOL_SERVER_PORT} \
    cd ${SYMBOL_SERVER_PATH};
    unzip -o $archive;
    rm -v $archive;"
+if test -n "$POST_SYMBOL_UPLOAD_CMD"; then
+  echo "${POST_SYMBOL_UPLOAD_CMD} \"${SYMBOL_SERVER_PATH}/${SYMBOL_INDEX_NAME}\""
+  ssh -2 ${SYMBOL_SERVER_PORT:+-p $SYMBOL_SERVER_PORT} \
+  ${SYMBOL_SERVER_SSH_KEY:+-i "$SYMBOL_SERVER_SSH_KEY"} \
+  -l ${SYMBOL_SERVER_USER} ${SYMBOL_SERVER_HOST} \
+  "${POST_SYMBOL_UPLOAD_CMD} \"${SYMBOL_SERVER_PATH}/${SYMBOL_INDEX_NAME}\""
+fi
 echo "Symbol transfer completed"