diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 2ecd4ee5d48757f7a181b28f6da98c8fe38bf3df..3ac2f6f80d9804ee093e6606a61d594695dfa7fe 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -246,18 +246,20 @@ if(LLCOMMON_LINK_SHARED)
         set_target_properties(llcommon PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SHARED_LIB_STAGING_DIR})
     endif(SHARED_LIB_STAGING_DIR)
 
-    get_target_property(LLCOMMON_PATH llcommon LOCATION)
-    get_filename_component(LLCOMMON_FILE ${LLCOMMON_PATH} NAME)
-    add_custom_command(
-        TARGET llcommon POST_BUILD
-        COMMAND ${CMAKE_COMMAND}
-        ARGS
-          -E
-          copy_if_different
-          ${LLCOMMON_FILE}
-          ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/${LLCOMMON_FILE}
-        COMMENT "Copying llcommon to the staging folder."
-        )
+    if(LINUX)
+        get_target_property(LLCOMMON_PATH llcommon LOCATION)
+        get_filename_component(LLCOMMON_FILE ${LLCOMMON_PATH} NAME)
+        add_custom_command(
+            TARGET llcommon POST_BUILD
+            COMMAND ${CMAKE_COMMAND}
+            ARGS
+              -E
+              copy_if_different
+              ${LLCOMMON_FILE}
+              ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/${LLCOMMON_FILE}
+            COMMENT "Copying llcommon to the staging folder."
+            )
+    endif(LINUX)
 
 else(LLCOMMON_LINK_SHARED)
     add_library (llcommon ${llcommon_SOURCE_FILES})
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0e0d4dedf71e9e2c666a72175ed05eaba5eb89bb..16731a41d5e2a61ef1999ad8c5d5b7b1a628b059 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -476,16 +476,27 @@ def construct(self):
                 self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib")
                 self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")
 
+                libdir = "../../libraries/universal-darwin/lib_release"
+                dylibs = {}
+
                 # need to get the kdu dll from any of the build directories as well
-                try:
-                    self.path(self.find_existing_file('../llkdu/%s/libllkdu.dylib' % self.args['configuration'],
-                        "../../libraries/universal-darwin/lib_release/libllkdu.dylib"),
-                        dst='libllkdu.dylib')
-                    pass
-                except:
-                    print "Skipping libllkdu.dylib"
-                    pass
-                
+                for lib in "llkdu", "llcommon":
+                    libfile = "lib%s.dylib" % lib
+                    try:
+                        self.path(self.find_existing_file('../%s/%s/%s' %
+                                                          (lib, self.args['configuration'], libfile),
+                                                          os.path.join(libdir, libfile)),
+                                  dst=libfile)
+                    except RuntimeError:
+                        print "Skipping %s" % libfile
+                        dylibs[lib] = False
+                    else:
+                        dylibs[lib] = True
+
+                if dylibs["llcommon"]:
+                    for libfile in ("libapr-1.0.3.7.dylib", "libaprutil-1.0.3.8.dylib"):
+                        self.path(os.path.join(libdir, libfile), libfile)
+
                 #libfmodwrapper.dylib
                 self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
                 
diff --git a/install.xml b/install.xml
index e5d7a93d2c54bddd9e9dd462626aad1cabd218a3..07a6d75b305c7d64dd8ffb3cdde9a70dd9c635fd 100644
--- a/install.xml
+++ b/install.xml
@@ -85,9 +85,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>c4de63e9416a800155aff3f96b149a0c</string>
+            <string>30e3b60d596801a4f4c74c56ece059dc</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090730.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090731.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>