diff --git a/cmake/externals/tbb/AndroidTBBLibCopy.cmake b/cmake/externals/tbb/AndroidTBBLibCopy.cmake
index 733ee00124..1c7697ab54 100644
--- a/cmake/externals/tbb/AndroidTBBLibCopy.cmake
+++ b/cmake/externals/tbb/AndroidTBBLibCopy.cmake
@@ -1,6 +1,6 @@
 # 
 #  AndroidTBBLibCopy.cmake
-#  cmake/macros
+#  cmake/externals/tbb
 # 
 #  Copyright 2015 High Fidelity, Inc.
 #  Created by Stephen Birarda on February 18, 2014
diff --git a/cmake/externals/tbb/CMakeLists.txt b/cmake/externals/tbb/CMakeLists.txt
index 56997db490..06da60ac04 100644
--- a/cmake/externals/tbb/CMakeLists.txt
+++ b/cmake/externals/tbb/CMakeLists.txt
@@ -48,6 +48,17 @@ if (APPLE)
   set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/libc++")
   set(_LIB_PREFIX "lib")
   set(_LIB_EXT "dylib")
+  
+  ExternalProject_Add_Step(
+    ${EXTERNAL_NAME}
+    change-install-name
+    COMMENT "Calling install_name_tool on TBB libraries to fix install name for dylib linking"
+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/OSXTBBInstallNameChange.cmake
+    DEPENDEES install
+    WORKING_DIRECTORY <SOURCE_DIR>
+    LOG 1
+  )
+  
 elseif (WIN32)
   set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/ia32/vc12")
   set(_LIB_EXT "lib")
diff --git a/cmake/externals/tbb/OSXTBBInstallNameChange.cmake b/cmake/externals/tbb/OSXTBBInstallNameChange.cmake
new file mode 100644
index 0000000000..c263ed7d2e
--- /dev/null
+++ b/cmake/externals/tbb/OSXTBBInstallNameChange.cmake
@@ -0,0 +1,59 @@
+# 
+#  OSXTBBInstallNameChange.cmake
+#  cmake/externals/tbb
+# 
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Stephen Birarda on February 20, 2014
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+
+# first find the so files in the source dir
+set(_TBB_LIBRARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/libc++)
+file(GLOB_RECURSE _TBB_LIBRARIES "${_TBB_LIBRARY_DIR}/*.dylib")
+
+# raise an error if we found none
+if (NOT _TBB_LIBRARIES)
+  message(FATAL_ERROR "Did not find any TBB libraries")
+endif ()
+
+# find the install_name_tool command
+find_program(INSTALL_NAME_TOOL_COMMAND NAMES install_name_tool DOC "Path to the install_name_tool command")
+
+# find the lipo command
+find_program(LIPO_COMMAND NAMES lipo DOC "Path to the lipo command")
+
+# enumerate the libraries
+foreach(_TBB_LIBRARY ${_TBB_LIBRARIES})
+  get_filename_component(_TBB_LIBRARY_FILENAME ${_TBB_LIBRARY} NAME)
+  
+  set(_LIPO_ARGS -remove i386 ${_TBB_LIBRARY_FILENAME} -output ${_TBB_LIBRARY_FILENAME})
+  message(STATUS "${LIPO_COMMAND} ${_LIPO_ARGS}")
+   
+  # first we use lipo to remove i386 from each dylib
+  execute_process(
+    COMMAND ${LIPO_COMMAND} ${_LIPO_ARGS}
+    WORKING_DIRECTORY ${_TBB_LIBRARY_DIR}
+    ERROR_VARIABLE _LIPO_ERROR
+  )
+  
+  if (_LIPO_ERROR)
+    message(FATAL_ERROR "There was an error removing i386 for ${_TBB_LIBRARY_FILENAME} - ${_LIPO_ERROR}")
+  endif ()
+  
+  set(_INSTALL_NAME_ARGS ${INSTALL_NAME_TOOL_COMMAND} -id ${_TBB_LIBRARY} ${_TBB_LIBRARY_FILENAME})
+  
+  message(STATUS "${INSTALL_NAME_COMMAND} ${_INSTALL_NAME_ARGS}")
+  
+  execute_process(
+    COMMAND ${INSTALL_NAME_COMMAND} ${_INSTALL_NAME_ARGS}
+    WORKING_DIRECTORY ${_TBB_LIBRARY_DIR}
+    ERROR_VARIABLE _INSTALL_NAME_ERROR
+  )
+  
+  if (_INSTALL_NAME_ERROR)
+    message(FATAL_ERROR "There was an error changing install name for ${_TBB_LIBRARY_FILENAME} - ${_INSTALL_NAME_ERROR}")
+  endif ()
+endforeach()
+