diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 872c54e61..432c3d20a 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -231,6 +231,28 @@ MACRO(ADD_QT_PLUGIN _TYPE _NAME)
   ENDIF()
 ENDMACRO()
 
+MACRO(ADD_QT_SYSTEM_LIBRARY _NAME)
+  # Save default suffixes
+  SET(_OLD_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+
+  # Define specific suffixes
+  SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+  # Find the library with specified suffixes
+  FIND_LIBRARY(${_NAME}_LIBRARY NAMES ${_NAME})
+
+  # Restore default suffixes
+  SET(CMAKE_FIND_LIBRARY_SUFFIXES ${_OLD_SUFFIXES})
+
+  IF(${_NAME}_LIBRARY)
+    MESSAGE(STATUS "Found ${${_NAME}_LIBRARY} ${_NAME}")
+
+    LIST(APPEND QT_LIBRARIES ${${_NAME}_LIBRARY})
+  ELSE()
+    MESSAGE(STATUS "Didn't find ${_NAME}")
+  ENDIF()
+ENDMACRO()
+
 IF(WITH_QT5)
   CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11 FATAL_ERROR)
 
@@ -316,13 +338,32 @@ IF(WITH_QT5)
         ADD_QT_PLUGIN(xcbglintegrations qxcb-glx-integration)
 
         ADD_QT_LIBRARY(XcbQpa)
+        ADD_QT_LIBRARY(GlxSupport)
+        ADD_QT_LIBRARY(ServiceSupport)
+        ADD_QT_LIBRARY(EdidSupport)
+        ADD_QT_LIBRARY(FontDatabaseSupport)
+        ADD_QT_LIBRARY(ThemeSupport)
+        ADD_QT_LIBRARY(EventDispatcherSupport)
         ADD_QT_LIBRARY(PlatformSupport)
-        SET(QT_LIBRARIES ${QT_LIBRARIES} -lX11-xcb -lXi -lSM -lICE -lxcb -lGL -lxcb-glx)
+
+        ADD_QT_LIBRARY(DBus)
+
         IF(EXISTS "${QT_LIBRARY_DIR}/libxcb-static.a")
           SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_LIBRARY_DIR}/libxcb-static.a")
         ENDIF()
-        SET(QT_LIBRARIES ${QT_LIBRARIES} -lfontconfig)
-        ADD_QT_LIBRARY(DBus)
+
+        # always link these in dynamic, API never changes
+        ADD_QT_SYSTEM_LIBRARY(X11)
+        ADD_QT_SYSTEM_LIBRARY(Xmu)
+        ADD_QT_SYSTEM_LIBRARY(X11-xcb)
+        ADD_QT_SYSTEM_LIBRARY(Xi)
+        ADD_QT_SYSTEM_LIBRARY(SM)
+        ADD_QT_SYSTEM_LIBRARY(ICE)
+        ADD_QT_SYSTEM_LIBRARY(xcb)
+        ADD_QT_SYSTEM_LIBRARY(GL)
+        ADD_QT_SYSTEM_LIBRARY(xcb-glx)
+        ADD_QT_SYSTEM_LIBRARY(fontconfig)
+        ADD_QT_SYSTEM_LIBRARY(Xrender)
       ENDIF()
 
       ADD_QT_PLUGIN(imageformats qgif)
@@ -333,6 +374,9 @@ IF(WITH_QT5)
       # harfbuzz is needed since Qt 5.3
       IF(UNIX)
         SET(HB_LIB "${QT_LIBRARY_DIR}/libqtharfbuzzng.a")
+        IF(NOT EXISTS ${HB_LIB})
+          SET(HB_LIB "${QT_LIBRARY_DIR}/libqtharfbuzz.a")
+        ENDIF()
       ELSEIF(WIN32)
         SET(HB_LIB "${QT_LIBRARY_DIR}/qtharfbuzzng.lib")
       ENDIF()
@@ -377,6 +421,9 @@ IF(WITH_QT5)
       # pcre is needed since Qt 5.5
       IF(UNIX)
         SET(PCRE_LIB "${QT_LIBRARY_DIR}/libqtpcre.a")
+        IF(NOT EXISTS ${PCRE_LIB})
+          SET(PCRE_LIB "${QT_LIBRARY_DIR}/libqtpcre2.a")
+        ENDIF()
       ELSEIF(WIN32)
         SET(PCRE_LIB "${QT_LIBRARY_DIR}/qtpcre.lib")
       ENDIF()
@@ -395,7 +442,7 @@ IF(WITH_QT5)
           ${CARBON_FRAMEWORK}
           ${SECURITY_FRAMEWORK})
       ELSEIF(UNIX)
-        SET(QT_LIBRARIES ${QT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -ldl -lrt)
+        SET(QT_LIBRARIES ${QT_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -ldl -lrt)
       ENDIF()
     ELSE()
       SET(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::Xml Qt5::Gui Qt5::OpenGL Qt5::Core)
diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index 99d958771..3919419be 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -672,7 +672,7 @@ MACRO(NL_SETUP_BUILD)
 
     IF(APPLE)
       SET(OBJC_FLAGS -fobjc-abi-version=2 -fobjc-legacy-dispatch -fobjc-weak)
-    
+
       IF(NOT XCODE)
         IF(CMAKE_OSX_ARCHITECTURES)
           SET(TARGETS_COUNT 0)
@@ -959,8 +959,6 @@ MACRO(NL_SETUP_BUILD)
       ADD_PLATFORM_FLAGS("-fPIC")
     ENDIF()
 
-    SET(PLATFORM_CXXFLAGS "${PLATFORM_CXXFLAGS} -ftemplate-depth-48")
-
     # hardening
     ADD_PLATFORM_FLAGS("-fstack-protector --param=ssp-buffer-size=4")