diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index bf7d65dd26..46457dc8d1 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2287,7 +2287,7 @@ if (DARWIN)
   set(product "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")
+  set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.phoenixviewer.firestorm.viewer-${ND_VIEWER_FLAVOR}")
   set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VIEWER_CHANNEL} ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")
   set(MACOSX_BUNDLE_BUNDLE_NAME "Firestorm")
   set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VIEWER_SHORT_VERSION}")
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index fd6a9fbb6a..0158b10edc 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -278,7 +278,11 @@ static LLAppViewerListener sAppViewerListener(LLAppViewer::instance);
 #if LL_DARWIN
 // <FS:CR>
 //const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.indra.viewer";
-const char * const LL_VERSION_BUNDLE_ID = "com.phoenixviewer.firestorm.viewer";
+#ifdef OPENSIM
+const char * const LL_VERSION_BUNDLE_ID = "com.phoenixviewer.firestorm.viewer-oss";
+#else // !OPENSIM
+const char * const LL_VERSION_BUNDLE_ID = "com.phoenixviewer.firestorm.viewer-hvk";
+#endif // OPENSIM
 // </FS:CR>
 extern void init_apple_menu(const char* product);
 #endif // LL_DARWIN