diff --git a/indra/cmake/ColladaDom.cmake b/indra/cmake/ColladaDom.cmake
index 3999e61045..6409f16557 100644
--- a/indra/cmake/ColladaDom.cmake
+++ b/indra/cmake/ColladaDom.cmake
@@ -2,11 +2,20 @@
 include (Prebuilt)
 
 if (USESYSTEMLIBS)
-  find_path(COLLADA_INCLUDE_DIRS 1.4/dom/domConstants.h
-    PATH_SUFFIXES collada collada-dom2.4)
-  set(COLLADA_INCLUDE_DIRS
-    ${COLLADA_INCLUDE_DIRS} ${COLLADA_INCLUDE_DIRS}/1.4
-    )
+  include(FindPkgConfig)
+  pkg_check_modules( MINIZIP REQUIRED minizip )
+  pkg_check_modules( LIBXML2 REQUIRED libxml-2.0 )
+  pkg_check_modules( LIBPCRECPP REQUIRED libpcrecpp )
+
+  find_library( COLLADADOM_LIBRARY collada14dom )
+  find_path( COLLADADOM_INCLUDE_DIR colladadom/dae.h )
+
+  if( COLLADADOM_INCLUDE_DIR STREQUAL "COLLADADOM_INCLUDE_DIR-NOTFOUND" )
+    message( FATAL_ERROR "Cannot find colladadom include dir" )
+  endif()
+  
+  set( COLLADA_INCLUDE_DIRS ${COLLADADOM_INCLUDE_DIR}/colladadom ${COLLADADOM_INCLUDE_DIR}/colladadom/1.4 )
+
 else (USESYSTEMLIBS)
   set(COLLADA_INCLUDE_DIRS
     ${LIBS_PREBUILT_DIR}/include/collada
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index b03bfc104e..d9012a80d4 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -364,10 +364,9 @@ copy_if_different(
     )
 set(third_party_targets ${third_party_targets} ${out_targets})
 
-#<FS:TS> We need to do this regardless
-#if(NOT USESYSTEMLIBS)
+if(NOT USESYSTEMLIBS)
   add_custom_target(
       stage_third_party_libs ALL
       DEPENDS ${third_party_targets}
       )
-#endif(NOT USESYSTEMLIBS)
+endif(NOT USESYSTEMLIBS)
diff --git a/indra/cmake/GoogleBreakpad.cmake b/indra/cmake/GoogleBreakpad.cmake
index 83cf9cb1e7..8a7b37d8ac 100644
--- a/indra/cmake/GoogleBreakpad.cmake
+++ b/indra/cmake/GoogleBreakpad.cmake
@@ -2,8 +2,8 @@
 include(Prebuilt)
 
 #if (USESYSTEMLIBS)
-#  set(BREAKPAD_EXCEPTION_HANDLER_FIND_REQUIRED ON)
-#  include(FindGoogleBreakpad)
+  set(BREAKPAD_EXCEPTION_HANDLER_FIND_REQUIRED ON)
+  include(FindGoogleBreakpad)
 #else (USESYSTEMLIBS)
   use_prebuilt_binary(google_breakpad)
   if (DARWIN)