diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index cb6abac7fc..165bb7b09d 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2539,7 +2539,7 @@ if (DARWIN)
   # Info-SecondLife.plist file in the configure_file() directive below.
   #set(product "${VIEWER_CHANNEL}")
   set(product "Firestorm")
-  set(MACOSX_EXECUTABLE_NAME "${VIEWER_CHANNEL}")
+  set(MACOSX_EXECUTABLE_NAME "Firestorm")
   set(MACOSX_BUNDLE_INFO_STRING "Firestorm Viewer")
   set(MACOSX_BUNDLE_ICON_FILE "firestorm_icon.icns")
   set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.phoenixviewer.firestorm.viewer-${ND_VIEWER_FLAVOR}")
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index cdc69476cc..1e273d3ad4 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1345,7 +1345,8 @@ class DarwinManifest(ViewerManifest):
 
     def construct(self):
         # copy over the build result (this is a no-op if run within the xcode script)
-        self.path(self.args['configuration'] + "/Firestorm.app", dst="")
+        # self.path(os.path.join(self.args['configuration'], self.channel()+".app"), dst="")
+        self.path(os.path.join(self.args['configuration'], "Firestorm.app"), dst="")
 
         pkgdir = os.path.join(self.args['build'], os.pardir, 'packages')
         relpkgdir = os.path.join(pkgdir, "lib", "release")