diff --git a/src/tomahawk/main.cpp b/src/tomahawk/main.cpp
index bde66a121..67a37b987 100644
--- a/src/tomahawk/main.cpp
+++ b/src/tomahawk/main.cpp
@@ -37,6 +37,10 @@
     #ifdef WITH_BREAKPAD
         #include "breakpad/BreakPad.h"
     #endif
+
+    #ifdef Q_WS_X11 // This is probably a very bad idea with Qt5 anyway... because (if at all) X lives in a QPA plugin
+        #include <X11/Xlib.h>
+    #endif
 #endif
 
 
@@ -138,6 +142,10 @@ main( int argc, char *argv[] )
     #endif // Q_WS_MAC
 #endif //Q_OS_WIN
 
+    #ifdef Q_WS_X11
+        XInitThreads();
+    #endif
+
     TomahawkApp a( argc, argv );
 
     // MUST register StateHash ****before*** initing TomahawkSettingsGui as constructor of settings does upgrade before Gui subclass registers type