diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,12 @@
                        PURPOSE "Needed by geolocation data engine."
                       )
 
+find_package(KF5Kirigami2 ${KF5_MIN_VERSION} CONFIG)
+set_package_properties(KF5Kirigami2 PROPERTIES
+    DESCRIPTION "A QtQuick based components set"
+    TYPE RUNTIME
+)
+
 # WARNING PlasmaQuick provides unversioned CMake config
 find_package(KF5 REQUIRED COMPONENTS PlasmaQuick)
 find_package(KF5 REQUIRED COMPONENTS SysGuard)
@@ -48,6 +54,7 @@
 
 find_package(KF5TextEditor)
 find_package(KWinDBusInterface CONFIG REQUIRED)
+find_package(LibKWorkspace ${PROJECT_VERSION})
 
 find_package(KScreenLocker 5.13.80 REQUIRED)
 find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
@@ -137,7 +144,10 @@
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 add_subdirectory(doc)
-add_subdirectory(libkworkspace)
+if(NOT LibKWorkspace_FOUND)
+    message(STATUS "System LibKWorkspace not found, using bundled.")
+    add_subdirectory(libkworkspace)
+endif()
 add_subdirectory(libdbusmenuqt)
 add_subdirectory(appmenu)