diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e7e5a910ed..347aaa5c47 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -889,6 +889,21 @@ class DarwinManifest(ViewerManifest):
             self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script))
 
     def package_finish(self):
+	# <FS:AO> Copied from windows manifest, since we're starting to use many of the same vars
+        # a standard map of strings for replacing in the templates
+        substitution_strings = {
+            'version' : '.'.join(self.args['version']),
+            'version_short' : '.'.join(self.args['version'][:-1]),
+            'version_dashes' : '-'.join(self.args['version']),
+            'grid':self.args['grid'],
+            'grid_caps':self.args['grid'].upper(),
+            'flags':self.flags_list().replace('"', '$\\"'),
+            'channel':self.channel(),
+            'channel_oneword':self.channel_oneword(),
+            'channel_unique':self.channel_unique(),
+            }
+	# </FS:AO>
+
         channel_standin = 'Firestorm'  # hah, our default channel is not usable on its own
         if not self.default_channel():
             channel_standin = self.channel()
@@ -1010,6 +1025,15 @@ class DarwinManifest(ViewerManifest):
         self.package_file = finalname
         self.remove(sparsename)
 
+        #AO: Try to package up symbols
+        # New Method, for reading cross platform stack traces on a linux/mac host
+        if (os.path.exists("%s/firestorm-symbols-darwin.tar.bz2" % self.args['configuration'].lower())):
+            # Rename to add version numbers
+            os.rename("%s/firestorm-symbols-darwin.tar.bz2" % self.args['configuration'].lower(),"%s/Phoenix_%s_%s_symbols-darwin.tar.bz2" % (self.args['configuration'].lower(),substitution_strings['channel_oneword'],substitution_strings['version_dashes']))
+
+
+
+
 class LinuxManifest(ViewerManifest):
     def construct(self):
         super(LinuxManifest, self).construct()