diff --git a/indra/newview/fs_viewer_manifest.py b/indra/newview/fs_viewer_manifest.py
index 6c0ea2921f..3837be50e9 100644
--- a/indra/newview/fs_viewer_manifest.py
+++ b/indra/newview/fs_viewer_manifest.py
@@ -183,3 +183,17 @@ class FSViewerManifest:
         self.run_command_shell( "sudo -n chown root:root %s || exit 0" % ( filename) )
         self.run_command_shell( "sudo -n chmod 4755 %s || exit 0" % ( filename) )
 
+    def fs_save_osx_symbols( self ):
+        if (os.path.exists("%s/firestorm-symbols-darwin-%d.tar.bz2" % (self.args['configuration'].lower(),
+                                                                       self.address_size))):
+            # Rename to add version numbers
+            sName = "%s/Phoenix_%s_%s_%s_symbols-darwin-%d.tar.bz2" % (self.args['configuration'].lower(),
+                                                                       self.fs_channel_legacy_oneword(),
+                                                                       '-'.join( self.args['version'] ),
+                                                                       self.args['viewer_flavor'],
+                                                                       self.address_size)
+
+            if os.path.exists( sName ):
+                os.unlink( sName )
+
+            os.rename("%s/firestorm-symbols-darwin-%d.tar.bz2" % (self.args['configuration'].lower(), self.address_size), sName )
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 4a17d90033..03c64ef9a3 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1865,7 +1865,7 @@ class DarwinManifest(ViewerManifest):
         # get rid of the temp file
         self.package_file = finalname
         self.remove(sparsename)
-
+        self.fs_save_osx_symbols()
 
 class Darwin_i386_Manifest(DarwinManifest):
     address_size = 32