diff --git a/cmake/FindSinkDependencies.cmake b/cmake/FindSinkDependencies.cmake
index d56cf5b7..656aac8c 100644
--- a/cmake/FindSinkDependencies.cmake
+++ b/cmake/FindSinkDependencies.cmake
@@ -20,43 +20,62 @@ function(FindX11 libs)
   pkg_check_modules(XCBDRI3 xcb-dri3)
   pkg_check_modules(XCBPRESENT xcb-present)
   pkg_check_modules(X11    REQUIRED x11)
+  pkg_check_modules(X11XCB REQUIRED x11-xcb)
   pkg_check_modules(XKB    xkbcommon)
   pkg_check_modules(XRANDR xrandr)
   pkg_check_modules(XRENDER xrender)
+
+  set(${X_LIBS} "")
   if(XCBDRI3_FOUND)
-	  set(${libs} ${${libs}} ${XCBDRI3_LIBRARIES} PARENT_SCOPE)
-	  include_directories (${XCBDRI3_INCLUDE_DIRS})
+      list(APPEND X_LIBS ${XCBDRI3_LIBRARIES})
+      #set(${libs} ${${libs}} ${XCBDRI3_LIBRARIES} PARENT_SCOPE)
+      include_directories (${XCBDRI3_INCLUDE_DIRS})
       add_definitions(-DHAVE_XCBDRI3)
   endif()
 
   if(XCBPRESENT_FOUND)
-	  set(${libs} ${${libs}} ${XCBPRESENT_LIBRARIES} PARENT_SCOPE)
-	  include_directories (${XCBPRESENT_INCLUDE_DIRS})
+      list(APPEND X_LIBS ${XCBPRESENT_LIBRARIES})
+      #set(${libs} ${${libs}} ${XCBPRESENT_LIBRARIES} PARENT_SCOPE)
+      include_directories (${XCBPRESENT_INCLUDE_DIRS})
       add_definitions(-DHAVE_XCBPRESENT)
   endif()
 
   if(X11_FOUND)
-    set(${libs} ${${libs}} ${X11_LIBRARIES} PARENT_SCOPE)
+    list(APPEND X_LIBS ${X11_LIBRARIES})
+    #set(${libs} ${${libs}} ${X11_LIBRARIES} PARENT_SCOPE)
     include_directories (${X11_INCLUDE_DIRS})
   endif()
 
+  if(X11XCB_FOUND)
+    list(APPEND X_LIBS ${X11XCB_LIBRARIES})
+    #set(${libs} ${${libs}} ${X11XCB_LIBRARIES} PARENT_SCOPE)
+    include_directories (${X11XCB_INCLUDE_DIRS})
+    add_definitions(-DHAVE_X11XCB)
+  endif()
+
+
   if(XKB_FOUND)
-    set(${libs} ${${libs}} ${XKB_LIBRARIES} PARENT_SCOPE)
+    list(APPEND X_LIBS ${XKB_LIBRARIES})
+    #set(${libs} ${${libs}} ${XKB_LIBRARIES} PARENT_SCOPE)
     include_directories (${XKB_INCLUDE_DIRS})
     add_definitions(-DHAVE_XKBLIB)
   endif()
 
   if(XRENDER_FOUND)
-    set(${libs} ${${libs}} ${XRENDER_LIBRARIES} PARENT_SCOPE)
+    list(APPEND X_LIBS ${XRENDER_LIBRARIES})
+    #set(${libs} ${${libs}} ${XRENDER_LIBRARIES} PARENT_SCOPE)
     include_directories (${XRENDER_INCLUDE_DIRS})
     add_definitions(-DHAVE_XRENDER)
   endif()
 
   if(XRANDR_FOUND)
-    set(${libs} ${${libs}} ${XRANDR_LIBRARIES} PARENT_SCOPE)
+    list(APPEND X_LIBS ${XRANDR_LIBRARIES})
+    #set(${libs} ${${libs}} ${XRANDR_LIBRARIES} PARENT_SCOPE)
     include_directories (${XRANDR_INCLUDE_DIRS})
     add_definitions(-DHAVE_XRANDR)
   endif()
+
+  set(${libs} ${X_LIBS} PARENT_SCOPE)
 endfunction(FindX11)
 
 function(FindEGL libs)