diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp
index 80ad05345a34a6273147dd7ba8c7c37fdeb2d901..528af3964c5ee7011736c468cb57dd32053beb0c 100644
--- a/indra/llvfs/lldir_linux.cpp
+++ b/indra/llvfs/lldir_linux.cpp
@@ -205,7 +205,7 @@ void LLDir_Linux::initAppDirs(const std::string &app_name,
 		LL_WARNS() << "Couldn't create LL_PATH_CACHE dir " << getExpandedFilename(LL_PATH_CACHE,"") << LL_ENDL;
 	}
 
-	mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "ca-bundle.crt");
+	mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
 }
 
 U32 LLDir_Linux::countFilesInDir(const std::string &dirname, const std::string &mask)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c0170fc38c16e9e6695c803fbddc8d24d99ecc3a..9d36dcfad647a08990ef2711b20a1ecd5075751a 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1381,7 +1381,7 @@ def construct(self):
 
         self.path("featuretable_linux.txt")
 
-        with self.prefix(src=pkgdir):
+        with self.prefix(src=pkgdir, dst="app_settings"):
             self.path("ca-bundle.crt")
 
     def package_finish(self):