diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index b52556a73e4fead0f075cf631f8203de6e8a3203..93b056fcb743d90af2a7a5087c007125b6aec2dc 100755
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -19,9 +19,17 @@ if (LINUX)
     # In order to support using ld.gold on linux, we need to explicitely
     # specify all libraries that llcommon uses.
     # llcommon uses `clock_gettime' which is provided by librt on linux.
-    set(LLCOMMON_LIBRARIES llcommon rt)
+    set(LLCOMMON_LIBRARIES llcommon rt 
+        ${BOOST_COROUTINE_LIBRARY} 
+        ${BOOST_CONTEXT_LIBRARY} 
+        ${BOOST_THREAD_LIBRARY} 
+        ${BOOST_SYSTEM_LIBRARY} )
 else (LINUX)
-    set(LLCOMMON_LIBRARIES llcommon)
+    set(LLCOMMON_LIBRARIES llcommon
+        ${BOOST_COROUTINE_LIBRARY} 
+        ${BOOST_CONTEXT_LIBRARY} 
+        ${BOOST_THREAD_LIBRARY} 
+        ${BOOST_SYSTEM_LIBRARY} )
 endif (LINUX)
 
 # add_definitions(${TCMALLOC_FLAG})