diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 80107d57762cd3d8fafdede9fd0801f5244a221e..095a64ca77a8c9d576c606dd0697e3d3c3cfa987 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -834,7 +834,8 @@ def package_finish(self):
                 keychain_pwd = open(keychain_pwd_path).read().rstrip()
 
                 self.run_command('security unlock-keychain -p "%s" "%s/Library/Keychains/viewer.keychain"' % ( keychain_pwd, home_path ) )
-                self.run_command('codesign --force --sign --verbose %(identity)r %(bundle)r' % {
+                self.run_command('codesign --force --keychain '"%(home_path)/Library/Keychains/viewer.keychain"' --sign --verbose %(identity)r %(bundle)r' % {i
+                                 'home_path' : home_path,
                                  'identity': identity,
                                   'bundle': self.get_dst_prefix()
                 })