--- /src/main.cpp	2015-08-07 17:43:59.000000000 +0200
+++ /src/main.cpp	2015-09-09 17:01:04.068655271 +0200
@@ -25,6 +25,8 @@
 #include "mainwindow.h"
 #include "sqlhelper.h"
 
+#include <X11/Xlib.h>
+
 class KaffeineApplication : public KUniqueApplication
 {
 public:
@@ -63,6 +65,8 @@
 
 int main(int argc, char *argv[])
 {
+	XInitThreads();
+	
 	KAboutData aboutData("kaffeine", 0, ki18n("Kaffeine"), "1.3-git",
 		ki18n("A media player for KDE with digital TV support."),
 	KAboutData::License_GPL_V2, ki18n("(C) 2007-2011 The Kaffeine Authors"),

--- /src/CMakeLists.txt	2015-08-07 17:43:59.000000000 +0200
+++ /src/CMakeLists.txt	2015-09-01 18:41:34.952066325 +0200
@@ -41,7 +41,7 @@
 
 kde4_add_executable(kaffeine ${kaffeinedvb_SRCS} ${kaffeine_SRCS})
 target_link_libraries(kaffeine ${QT_QTSQL_LIBRARY} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS}
-                      ${KDE4_SOLID_LIBS} ${X11_Xscreensaver_LIB} ${VLC_LIBRARY})
+                      ${KDE4_SOLID_LIBS} ${X11_Xscreensaver_LIB} ${VLC_LIBRARY} -lX11)
 install(TARGETS kaffeine ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES scanfile.dvb DESTINATION ${DATA_INSTALL_DIR}/kaffeine)
 install(PROGRAMS kaffeine.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})