diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake
index a36485f6d0fb6cf4f2c5a768cbb98d316f193336..689b49e2b9a00d12b670e9b7e2b9b49cbf25e4dd 100644
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -1,14 +1,15 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (USESYSTEMLIBS)
+if (LINUX OR USESYSTEMLIBS)
   include(FindPkgConfig)
 
   pkg_check_modules(FREETYPE REQUIRED freetype2)
-else (USESYSTEMLIBS)
+  pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
+else ()
   use_prebuilt_binary(freetype)
   set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/freetype2/)
   set(FREETYPE_LIBRARIES freetype)
-endif (USESYSTEMLIBS)
+endif ()
 
 link_directories(${FREETYPE_LIBRARY_DIRS})
diff --git a/indra/cmake/ViewerManager.cmake b/indra/cmake/ViewerManager.cmake
index 7150ffc4d17f5f8cbd13bc0f876f2e3b8e6e9156..77cac3a187781c05f84af289e01474fbda71e30f 100644
--- a/indra/cmake/ViewerManager.cmake
+++ b/indra/cmake/ViewerManager.cmake
@@ -1,3 +1,4 @@
 include (Prebuilt)
-use_prebuilt_binary(viewer-manager)
-
+if(NOT LINUX)
+    use_prebuilt_binary(viewer-manager)
+endif()
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index fc5bdedb5afb3a5a3a23b3146c9500e582fe4119..beba41362dc733f803204babe8441ecfb073ed9e 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -4,7 +4,6 @@ include(Prebuilt)
 if (NOT USESYSTEMLIBS)
   if (LINUX)
     use_prebuilt_binary(libuuid)
-    use_prebuilt_binary(fontconfig)
   endif (LINUX)
   use_prebuilt_binary(libhunspell)
   use_prebuilt_binary(slvoice)
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 7ac49a80ed118b16383872ed6ff1b466ce5ca74e..ae56f73e2bef07e763d834abddde22d74ceb7242 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -73,11 +73,10 @@ if (LINUX)
       ${LLMATH_LIBRARIES}
       ${LLRENDER_LIBRARIES}
       ${LLVFS_LIBRARIES}
-      ${LLWINDOW_LIBRARIES}
       ${LLXML_LIBRARIES}
       ${UI_LIBRARIES}     # for GTK
       ${SDL_LIBRARY}
-      fontconfig          # For FCInit and other FC* functions.
+      ${FONTCONFIG_LIBRARIES}          # For FCInit and other FC* functions.
       )
 
   list(APPEND viewer_SOURCE_FILES