diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 7638a74bc1ba393076c5dfa4a366ef5adeab08ef..954d5ce9edb46e72bbb0675734db6f4eba9ef141 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1361,9 +1361,16 @@ if (DARWIN)
     llappdelegate-objc.mm
     PROPERTIES
     COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}"
+    # BugsplatMac is a module, imported with @import. That language feature
+    # demands these switches.
     COMPILE_FLAGS "-fmodules -fcxx-modules"
     )
 
+  # from https://stackoverflow.com/a/43551534
+  set(CMAKE_MACOSX_RPATH 1)
+  # From Contents/MacOS/SecondLife, look in Contents/Frameworks
+  set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks")
+
   find_library(AGL_LIBRARY AGL)
   find_library(APPKIT_LIBRARY AppKit)
   find_library(COCOA_LIBRARY Cocoa)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 3375d4e071309d8f75fa35ff2e14a0dc55459022..d1a56c2230cbc3dd1aed84ab6a0da34c7167117c 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1005,13 +1005,15 @@ def construct(self):
                         os.path.basename(Info_plist),
                         "Info.plist")
 
-                    # CEF framework goes inside viewer_app/Contents/Frameworks.
-                    # Remember where we parked this car.
                     with self.prefix(src="", dst="Frameworks"):
+                        # CEF framework goes inside viewer_app/Contents/Frameworks.
                         CEF_framework = "Chromium Embedded Framework.framework"
                         self.path2basename(relpkgdir, CEF_framework)
+                        # Remember where we parked this car.
                         CEF_framework = self.dst_path_of(CEF_framework)
 
+                        self.path2basename(relpkgdir, "BugsplatMac.framework")
+
                     with self.prefix(dst="MacOS"):
                         # CMake constructs the Second Life executable in the
                         # MacOS directory belonging to the top-level Second