diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake
index df267985c4..79159843e1 100644
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -9,7 +9,11 @@ else (USESYSTEMLIBS)
   use_prebuilt_binary(freetype)
   set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
   set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/freetype2) #<FS:ND/> Also add freetype2 to search dir, or some includes will fail.
-  set(FREETYPE_LIBRARIES freetype)
+  # <FS:ND> Linux links this via UI.cmake
+  if( NOT LINUX )
+    set(FREETYPE_LIBRARIES freetype)
+  endif()
+  # </FS:ND>
 endif (USESYSTEMLIBS)
 
 link_directories(${FREETYPE_LIBRARY_DIRS})
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index 8c5d266cf5..caf1be07f9 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -46,7 +46,7 @@ else (USESYSTEMLIBS)
   if (LINUX)
     set(UI_LIB_NAMES
         libfltk.a
-        freetype
+        libfreetype.a
         )
 
     foreach(libname ${UI_LIB_NAMES})
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index bb003a77e3..53e4df3825 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -77,7 +77,8 @@ if (LINUX)
       ${LLXML_LIBRARIES}
       ${UI_LIBRARIES}     # for GTK
       ${SDL_LIBRARY}
-      fontconfig          # For FCInit and other FC* functions.
+      libfontconfig.a          # For FCInit and other FC* functions.
+      libfreetype.a
       )
 
   list(APPEND viewer_SOURCE_FILES 
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 67d7225287..1f95f79c19 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -2020,7 +2020,7 @@ class LinuxManifest(ViewerManifest):
             # particular wildcard specification gets us exactly what the
             # previous call did, without having to explicitly state the
             # version number.
-            self.path("libfontconfig.so.*.*")
+            #self.path("libfontconfig.so.*.*")
 
             self.fs_try_path("libjemalloc.so*")