diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 6a9aafc77..d4ee2d244 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -88,17 +88,18 @@ if (VIEWER)
     add_dependencies(viewer linux-crash-logger-strip-target)
   elseif (DARWIN)
     add_subdirectory(${VIEWER_PREFIX}mac_crash_logger)
-    add_subdirectory(${VIEWER_PREFIX}mac_updater)
-    add_dependencies(viewer mac-updater mac-crash-logger)
+	#add_subdirectory(${VIEWER_PREFIX}mac_updater)
+    add_dependencies(viewer mac-crash-logger)
+	#add_dependencies(viewer mac-updater)
   elseif (WINDOWS)
     add_subdirectory(${VIEWER_PREFIX}win_crash_logger)
     # cmake EXISTS requires an absolute path, see indra/cmake/Variables.cmake
     if (EXISTS ${VIEWER_DIR}win_setup)
       add_subdirectory(${VIEWER_DIR}win_setup)
     endif (EXISTS ${VIEWER_DIR}win_setup)
-    add_subdirectory(${VIEWER_PREFIX}win_updater)
-    # add_dependencies(viewer windows-updater windows-setup windows-crash-logger)
-    add_dependencies(viewer windows-updater windows-crash-logger)
+	#add_subdirectory(${VIEWER_PREFIX}win_updater)
+	#add_dependencies(viewer windows-updater)
+    add_dependencies(viewer windows-crash-logger)
   elseif (SOLARIS)
     add_subdirectory(solaris_crash_logger)
     add_dependencies(viewer solaris-crash-logger)
diff --git a/indra/mac_updater/CMakeLists.txt b/indra/mac_updater/CMakeLists.txt
index 946ea3301..b769a2e17 100644
--- a/indra/mac_updater/CMakeLists.txt
+++ b/indra/mac_updater/CMakeLists.txt
@@ -50,6 +50,7 @@ set_target_properties(mac-updater
 target_link_libraries(mac-updater
     ${LLVFS_LIBRARIES}
     ${CURL_LIBRARIES}
+	${OPENSSL_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
     )
 
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index edd72e183..fda44458d 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -486,7 +486,7 @@ class DarwinManifest(ViewerManifest):
                 
                 # our apps
                 self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app")
-                self.path("../mac_updater/" + self.args['configuration'] + "/mac-updater.app", "mac-updater.app")
+                #self.path("../mac_updater/" + self.args['configuration'] + "/mac-updater.app", "mac-updater.app")
 
                 # plugin launcher
                 self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin", "SLPlugin")
diff --git a/install.xml b/install.xml
index c63a53637..171cd8982 100644
--- a/install.xml
+++ b/install.xml
@@ -125,16 +125,16 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>d9ce3ace9235249b7edf6f564de83395</string>
+            <string>cdb2f5c4a5a1f9ecd75bc1dbdd4db8e9</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.4.0-darwin-20080731b.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-darwin-20100606.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>946c2e106f14f7a1e521d4a14e0e146f</string>
+            <string>91694429e391efeea1de974df26032a2</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.4.0-linux-20081202.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-linux-20100527.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
@@ -146,9 +146,9 @@
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>f5cf8d121b26f2e7944f7e63cdbff04d</string>
+            <string>4b84738eec2e21b0c096d53b79ee2681</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.6.0-windows-20091105.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-windows-20100611a.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -227,46 +227,46 @@
           </map>
         </map>
       </map>
-      <key>curl</key>
-      <map>
-        <key>copyright</key>
-        <string>Copyright (c) 1996 - 2008, Daniel Stenberg, &lt;daniel@haxx.se&gt;.</string>
-        <key>description</key>
-        <string>Client-side URL transfer library. Handles moving data across the net in many different protocols. Used to GET/POST/PUT/DELETE web resources. </string>
-        <key>license</key>
-        <string>curl</string>
-        <key>packages</key>
-        <map>
-          <key>darwin</key>
-          <map>
-            <key>md5sum</key>
-            <string>1bece4ebdc5fc3818854bc3df14b511b</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4a-darwin-20090304.tar.bz2</uri>
-          </map>
-          <key>linux</key>
-          <map>
-            <key>md5sum</key>
-            <string>0f366e421ae9c72d9659bd20a2a326d6</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4a-linux-20090303a.tar.bz2</uri>
-          </map>
-          <key>linux64</key>
-          <map>
-            <key>md5sum</key>
-            <string>6994192cea7ab2d885a158a3de474273</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4a-linux64-20090303.tar.bz2</uri>
-          </map>
-          <key>windows</key>
-          <map>
-            <key>md5sum</key>
-            <string>53e5ab7affff7121a5af2f82b4d58b54</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.19.6-windows-20091016.tar.bz2</uri>
-          </map>
-        </map>
-      </map>
+			<key>curl</key>
+			<map>
+				<key>copyright</key>
+				<string>Copyright (c) 1996 - 2008, Daniel Stenberg, &lt;daniel@haxx.se&gt;.</string>
+				<key>description</key>
+				<string>Client-side URL transfer library. Handles moving data across the net in many different protocols. Used to GET/POST/PUT/DELETE web resources.</string>
+				<key>license</key>
+				<string>curl</string>
+				<key>packages</key>
+				<map>
+					<key>darwin</key>
+					<map>
+						<key>md5sum</key>
+						<string>752e295ccb17f0dcb7c0167db3ad1e69</string>
+						<key>url</key>
+						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-darwin-20100606.tar.bz2</uri>
+					</map>
+					<key>linux</key>
+					<map>
+						<key>md5sum</key>
+						<string>a20e73f2e7d6a032ff25a5161b1b7394</string>
+						<key>url</key>
+						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-linux-20100527.tar.bz2</uri>
+					</map>
+					<key>linux64</key>
+					<map>
+						<key>md5sum</key>
+						<string>6994192cea7ab2d885a158a3de474273</string>
+						<key>url</key>
+						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4a-linux64-20090303.tar.bz2</uri>
+					</map>
+					<key>windows</key>
+					<map>
+						<key>md5sum</key>
+						<string>b28856d3d02ee680353ae440561a6579</string>
+						<key>url</key>
+						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-windows-20100611.tar.bz2</uri>
+					</map>
+				</map>
+			</map>
       <key>dbghelp</key>
       <map>
         <key>copyright</key>