diff --git a/indra/mac_updater/mac_updater.cpp b/indra/mac_updater/mac_updater.cpp
index 5d19e8a8899b0eb3ca3bd36d558cf6ca5d5a7b4c..809f66cb1d443dfe793440726361baab49d7c1ca 100644
--- a/indra/mac_updater/mac_updater.cpp
+++ b/indra/mac_updater/mac_updater.cpp
@@ -1230,20 +1230,14 @@ void *updatethreadproc(void*)
 	// Move work directory to the trash
 	if(tempDir[0] != 0)
 	{
-//		chdir("/");
-//		FSDeleteObjects(tempDirRef);
-
 		llinfos << "Moving work directory to the trash." << llendl;
 
-		err = FSMoveObject(&tempDirRef, &trashFolderRef, NULL);
+		FSRef trashRef;
+		OSStatus err = FSMoveObjectToTrashSync(&tempDirRef, &trashRef, 0); 
 		if(err != noErr) {
 			llwarns << "failed to move files to trash, (error code " <<
 				err << ")" << llendl;
 		}
-
-//		snprintf(temp, sizeof(temp), "rm -rf '%s'", tempDir);
-//		printf("%s\n", temp);
-//		system(temp);
 	}
 	
 	if(!gCancelled  && !gFailure && (target[0] != 0))
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 39ac03cd20a3789e0eaba54624f361398966cb59..f0b1973fdf0740c90d21586f57ef159b1d906b15 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -953,7 +953,7 @@ def construct(self):
             self.path("libopenjpeg.so.1")
             self.path("libopenjpeg.so")
             self.path("libalut.so")
-            self.path("libopenal.so")
+            self.path("libopenal.so", "libopenal.so.1")
             self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname
             self.path("libfontconfig.so.1.4.4")
             try: