--- a/ui/CMakeLists.txt	Thu Aug 07 13:05:26 2014 +0200
+++ b/ui/CMakeLists.txt	Thu Aug 07 19:12:37 2014 +0200
@@ -61,10 +61,12 @@
 set(TRUSTBRIDGE_RESOURCES
    ${CMAKE_CURRENT_SOURCE_DIR}/icons.qrc
    ${CMAKE_CURRENT_SOURCE_DIR}/certs.qrc
+   ${CMAKE_CURRENT_SOURCE_DIR}/fonts.qrc
 )
 
 set(ADMINISTRATOR_RESOURCES
    ${CMAKE_CURRENT_SOURCE_DIR}/icons.qrc
+   ${CMAKE_CURRENT_SOURCE_DIR}/fonts.qrc
 )
 
 if(UNIX)
@@ -74,20 +76,14 @@
    get_target_property(_loc Qt5::Widgets LOCATION)
    get_filename_component(_qtpath ${_loc} PATH)
 
-   if(NOT XKBCOMMON_LIB)
-      # Hack on a hack to overwrite the xkbcommon libname.
-      set(XKBCOMMON_LIB -lxkbcommon)
-   endif()
-
    set(XCB_EXTRA_LIBS
       -L${_qtpath}
+      -lQt5DBus -lQt5Gui -lQt5Core -lQt5PlatformSupport
+      -lX11 -lX11-xcb -lxcb -lxcb-static
+      -lXrender -lSM -lICE -ldbus-1
+      -lm -ldl -lrt -lpthread )
 
-      -lX11 -lX11-xcb -lxcb -lxcb-static -lXi -lXrender -lSM -lICE -ldbus-1
-      ${XKBCOMMON_LIB} -lQt5PlatformSupport
-      -lfreetype -lQt5DBus -lQt5Gui -ljpeg -lpng -lQt5Core
-      -lz -lm -ldl -lrt -lpthread -lfontconfig)
-
-   set(EXTRA_STATIC_LIBS -lz -lpthread -ldl -lpng -ljpeg
+   set(EXTRA_STATIC_LIBS -lpthread -ldl
       Qt5::QXcbIntegrationPlugin ${XCB_EXTRA_LIBS})
 
 elseif(WIN32)
@@ -96,7 +92,8 @@
    set(WINDOWS_EXTRA_LIBS
         -L${_qtpath}
         -lwinspool -lshlwapi -lfreetype -lbz2 -lpng16
-        -lQt5PlatformSupport -lQt5Gui -lcomdlg32 -loleaut32 -limm32 -lwinmm
+        -lQt5PlatformSupport -lQt5Gui -lcomdlg32 -loleaut32 -limm32
+        -lharfbuzz -lglib-2.0 -lintl -liconv -lwinmm
         -lglu32 -lopengl32 -lgdi32 -ljpeg -lpng -lQt5Core -lole32 -lmstask -luuid -lws2_32
         -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lsicuin -lsicuuc -lsicudt -lpcre16)