diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index fae1ef2a512cc4bacb509b95ad355fe634d77019..dd55bbfc50cf1896a6a4841eb02e9268fe93fef1 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -11,13 +11,14 @@ set(LLPRIMITIVE_INCLUDE_DIRS
     )
 
 if (WINDOWS)
-    set(LLPRIMITIVE_LIBRARIES 
-        llprimitive
+	set(LLPRIMITIVE_LIBRARIES 
+        debug llprimitive
+        optimized llprimtive
         debug libcollada14dom21-d
-        debug libboost_filesystem-d
-        debug libboost_system-d
         optimized libcollada14dom21
+        debug libboost_filesystem-d
         optimized libboost_filesystem
+        debug libboost_system-d
         optimized libboost_system
         )
 else (WINDOWS)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 0997c80e46d0f57bf439fbe5f501d8790c19c8b7..2b4a2dfdb04ab51d59fd63c2a0b8e4a826ec7142 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1270,7 +1270,6 @@ if (WINDOWS)
         ${DINPUT_LIBRARY}
         ${DXGUID_LIBRARY}
         kernel32
-        libboost_system
         odbc32
         odbccp32
         ole32