diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt
index fdbd4dff..0aa22a5f 100644
--- a/external/qt/CMakeLists.txt
+++ b/external/qt/CMakeLists.txt
@@ -380,7 +380,6 @@ else()
             xcb-util
             xcb-render-util
             xcb-keysyms
-            xcb-record
             ffi
         )
         if (DESKTOP_APP_USE_GLIBC_WRAPS)
diff --git a/external/xcb/CMakeLists.txt b/external/xcb/CMakeLists.txt
index d413d1ec..0f16bf3a 100644
--- a/external/xcb/CMakeLists.txt
+++ b/external/xcb/CMakeLists.txt
@@ -7,6 +7,8 @@
 add_library(external_xcb INTERFACE IMPORTED GLOBAL)
 add_library(desktop-app::external_xcb ALIAS external_xcb)
 
+add_subdirectory(xcb_keysyms)
+add_subdirectory(xcb_record)
 add_subdirectory(xcb_screensaver)
 
 if (DESKTOP_APP_USE_PACKAGED)
diff --git a/external/xcb/xcb_keysyms/CMakeLists.txt b/external/xcb/xcb_keysyms/CMakeLists.txt
new file mode 100644
index 00000000..59cf070f
--- /dev/null
+++ b/external/xcb/xcb_keysyms/CMakeLists.txt
@@ -0,0 +1,16 @@
+# This file is part of Desktop App Toolkit,
+# a set of libraries for developing nice desktop applications.
+#
+# For license and copyright information please follow this link:
+# https://github.com/desktop-app/legal/blob/master/LEGAL
+
+add_library(external_xcb_keysyms INTERFACE IMPORTED GLOBAL)
+add_library(desktop-app::external_xcb_keysyms ALIAS external_xcb_keysyms)
+
+if (DESKTOP_APP_USE_PACKAGED)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(XCB_KEYSYMS REQUIRED IMPORTED_TARGET xcb-keysyms)
+    target_link_libraries(external_xcb_keysyms INTERFACE PkgConfig::XCB_KEYSYMS)
+else()
+    target_link_static_libraries(external_xcb_keysyms INTERFACE xcb-keysyms)
+endif()
diff --git a/external/xcb/xcb_record/CMakeLists.txt b/external/xcb/xcb_record/CMakeLists.txt
new file mode 100644
index 00000000..798b9f22
--- /dev/null
+++ b/external/xcb/xcb_record/CMakeLists.txt
@@ -0,0 +1,16 @@
+# This file is part of Desktop App Toolkit,
+# a set of libraries for developing nice desktop applications.
+#
+# For license and copyright information please follow this link:
+# https://github.com/desktop-app/legal/blob/master/LEGAL
+
+add_library(external_xcb_record INTERFACE IMPORTED GLOBAL)
+add_library(desktop-app::external_xcb_record ALIAS external_xcb_record)
+
+if (DESKTOP_APP_USE_PACKAGED)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(XCB_RECORD REQUIRED IMPORTED_TARGET xcb-record)
+    target_link_libraries(external_xcb_record INTERFACE PkgConfig::XCB_RECORD)
+else()
+    target_link_static_libraries(external_xcb_record INTERFACE xcb-record)
+endif()