diff --git a/autobuild.xml b/autobuild.xml
index eac44e1a9da5b74109431126463c7536d5dc5aa9..90089fddc1051ca481f26124dcdd1728594e2363 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1693,10 +1693,14 @@
       </map>
       <key>inteltbb</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright © 2005-2015 Intel Corporation. All Rights Reserved.</string>
+        <key>description</key>
+        <string>Intel Threaded Building Blocks Library</string>
         <key>license</key>
-        <string>gplv2</string>
+        <string>GPLv2 with Runtime Exception</string>
         <key>license_file</key>
-        <string>LICENSES/tbb.txt</string>
+        <string>LICENSES/inteltbb.txt</string>
         <key>name</key>
         <string>inteltbb</string>
         <key>platforms</key>
@@ -1706,9 +1710,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>fbd94e58f8d9c133b5ab1087bb904325</string>
+              <string>8a2c78fe9f76dd3555b637261bc8f821</string>
+              <key>hash_algorithm</key>
+              <string>md5</string>
               <key>url</key>
-              <string>https://bitbucket.org/alchemyviewer/publiclibs/downloads/inteltbb-4.2u3-windows-vs11-20140403.tar.bz2</string>
+              <string>http://depot.alchemyviewer.org/pub/windows/lib/inteltbb-4.3u5-windows-201505010050.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -1718,14 +1724,18 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>910d16bf97a6d1dd552a47d82343e427</string>
+              <string>75a91e5e64ad9b2ca6752c8b826ad794</string>
+              <key>hash_algorithm</key>
+              <string>md5</string>
               <key>url</key>
-              <string>https://bitbucket.org/alchemyviewer/publiclibs/downloads/inteltbb-4.2u3-windows64-vs11-20140227.tar.bz2</string>
+              <string>http://depot.alchemyviewer.org/pub/windows64/lib/inteltbb-4.3u5-windows64-201505010047.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
           </map>
         </map>
+        <key>version</key>
+        <string>4.3u5</string>
       </map>
       <key>jpeglib</key>
       <map>
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index e756b5e736efde7809f4897c1732e25809b28940..b9ddae1af293e3c4e99a5f3a181abb5e571cbacc 100755
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -10,10 +10,10 @@ else (USESYSTEMLIBS)
        set(TCMALLOC_LIBRARIES 
          debug libtcmalloc_minimal-debug
          optimized libtcmalloc_minimal)
-       set(MALLOC_LINK_FLAGS  "/INCLUDE:__tcmalloc")
+       set(TCMALLOC_LINK_FLAGS  "/INCLUDE:__tcmalloc")
     else (USE_TCMALLOC)
       set(TCMALLOC_LIBRARIES)
-      set(MALLOC_LINK_FLAGS)
+      set(TCMALLOC_LINK_FLAGS)
     endif (USE_TCMALLOC)
     set(GOOGLE_PERFTOOLS_FOUND "YES")
   endif (WINDOWS)
diff --git a/indra/cmake/IntelTBB.cmake b/indra/cmake/IntelTBB.cmake
index d506e05bf6fd041933ad78d3c52515406b2dbe3b..a264d51549091ec5655f861f04cd62827f77b1fa 100644
--- a/indra/cmake/IntelTBB.cmake
+++ b/indra/cmake/IntelTBB.cmake
@@ -1,33 +1,28 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (STANDALONE)
-else (STANDALONE)
-  if (WINDOWS)
-    if (USE_TBBMALLOC AND NOT USE_TCMALLOC)
-       use_prebuilt_binary(inteltbb)
-       set(TBBMALLOC_LIBRARIES 
-         debug tbbmalloc_proxy_debug
-         optimized tbbmalloc_proxy)
-       if(WORD_SIZE EQUAL 64)
-         set(MALLOC_LINK_FLAGS  "/INCLUDE:__TBB_malloc_proxy")
-       else(WORD_SIZE EQUAL 64) 
-         set(MALLOC_LINK_FLAGS  "/INCLUDE:___TBB_malloc_proxy")
-       endif(WORD_SIZE EQUAL 64)
-    else (USE_TCMALLOC AND NOT USE_TCMALLOC)
-      set(TBBMALLOC_LIBRARIES)
-      set(MALLOC_LINK_FLAGS)
-    endif (USE_TBBMALLOC AND NOT USE_TCMALLOC)
-  endif (WINDOWS)
-  if (LINUX)
-    if (USE_TBBMALLOC AND NOT USE_TCMALLOC)
-      use_prebuilt_binary(inteltbb)
+if(USE_TBBMALLOC)
+  if(STANDALONE)
+  else(STANDALONE)
+    use_prebuilt_binary(inteltbb)
+    if(WINDOWS)
       set(TBBMALLOC_LIBRARIES 
-        debug tbbmalloc_proxy_debug tbbmalloc_debug
-        optimized tbbmalloc_proxy tbbmalloc)
-    else (USE_TBBMALLOC AND NOT USE_TCMALLOC)
-      set(TBBMALLOC_LIBRARIES)
-    endif (USE_TBBMALLOC AND NOT USE_TCMALLOC)
-  endif (LINUX)
-endif (STANDALONE)
-
+          debug tbbmalloc_proxy_debug
+          optimized tbbmalloc_proxy
+          )
+      if(WORD_SIZE EQUAL 64)
+         set(TBBMALLOC_LINK_FLAGS  "/INCLUDE:__TBB_malloc_proxy")
+      else(WORD_SIZE EQUAL 64) 
+         set(TBBMALLOC_LINK_FLAGS  "/INCLUDE:___TBB_malloc_proxy")
+      endif(WORD_SIZE EQUAL 64)
+    elseif(LINUX)
+      set(TBBMALLOC_LIBRARIES 
+          debug tbbmalloc_proxy_debug
+          optimized tbbmalloc_proxy
+          )
+    endif(WINDOWS)
+  endif(STANDALONE)
+else(USE_TBBMALLOC)
+  set(TBBMALLOC_LIBRARIES "")
+  set(TBBMALLOC_LINK_FLAGS "")
+endif(USE_TBBMALLOC)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index e0cfa2d5c0dbf600db2a99cf69347e607b83198d..cbadd31b27a3a0161b3b80708dcf3acb21957aef 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1743,10 +1743,9 @@ set(PACKAGE ON CACHE BOOL
 if (WINDOWS)
     set_target_properties(${VIEWER_BINARY_NAME}
         PROPERTIES
-        # *TODO -reenable this once we get server usage sorted out
-        LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS ${MALLOC_LINK_FLAGS} /LARGEADDRESSAWARE"
-        LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /LARGEADDRESSAWARE"
-        LINK_FLAGS_RELEASE "/MAP\"alchemy-bin.MAP\" /LARGEADDRESSAWARE"
+        LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS ${TCMALLOC_LINK_FLAGS} ${TBBMALLOC_LINK_FLAGS}"
+        LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\""
+        LINK_FLAGS_RELEASE "/MAP:\"alchemy-bin.MAP\""
         )
 
     add_dependencies(${VIEWER_BINARY_NAME} generate_viewer_version)