diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c6cf7d5..3e4fed27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,77 +1,79 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(kdeconnect)
 
 set(KDECONNECT_VERSION_MAJOR 1)
 set(KDECONNECT_VERSION_MINOR 3)
 set(KDECONNECT_VERSION_PATCH 0)
 set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}")
 
 set(QT_MIN_VERSION "5.7.0")
 set(KF5_MIN_VERSION "5.42.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake)
 
 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Quick)
 
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils)
-find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS DocTools)
+find_package(KF5 ${KF5_MIN_VERSION}
+    REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils
+    OPTIONAL_COMPONENTS DocTools
+)
 find_package(Qca-qt5 2.1.0 REQUIRED)
 
 include_directories(${CMAKE_SOURCE_DIR})
 
 configure_file(kdeconnect-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/kdeconnect-version.h)
 
 include(KDEInstallDirs)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(KDECMakeSettings)
 include(ECMAddTests)
 include(ECMSetupVersion)
 include(ECMInstallIcons)
 include(FeatureSummary)
 
 include(KDEConnectMacros.cmake)
 
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_KEYWORDS)
 
 include(GenerateExportHeader)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 add_subdirectory(core)
 add_subdirectory(kcm)
 add_subdirectory(kcmplugin)
 if(NOT WIN32)
 	add_subdirectory(kio)
 	add_subdirectory(plasmoid)
 endif()
 add_subdirectory(icon)
 add_subdirectory(interfaces)
 
 option(EXPERIMENTALAPP_ENABLED OFF)
 if(EXPERIMENTALAPP_ENABLED)
     add_subdirectory(app)
 endif()
 add_subdirectory(daemon)
 add_subdirectory(plugins)
 add_subdirectory(cli)
 add_subdirectory(indicator)
 add_subdirectory(fileitemactionplugin)
 add_subdirectory(urlhandler)
 add_subdirectory(nautilus-extension)
 
 option(SMSAPP_ENABLED OFF)
 if(SMSAPP_ENABLED)
     find_package(KF5People REQUIRED)
     add_subdirectory(smsapp)
 endif()
 if(KF5DocTools_FOUND)
     add_subdirectory(doc)
 endif()
 
 if(BUILD_TESTING)
     add_subdirectory(tests)
 endif()
 
 install(FILES org.kde.kdeconnect.kcm.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/plugins/mousepad/CMakeLists.txt b/plugins/mousepad/CMakeLists.txt
index 7f14139e..8ea00470 100644
--- a/plugins/mousepad/CMakeLists.txt
+++ b/plugins/mousepad/CMakeLists.txt
@@ -1,39 +1,39 @@
 if(UNIX)
-    find_package(KF5 ${KF5_MIN_VERSION} QUIET COMPONENTS Wayland)
+    find_package(KF5 ${KF5_MIN_VERSION} QUIET OPTIONAL_COMPONENTS Wayland)
 
     find_package(LibFakeKey QUIET)
     set_package_properties(LibFakeKey PROPERTIES DESCRIPTION "fake key events"
                         URL "https://www.yoctoproject.org/tools-resources/projects/matchbox"
                         TYPE OPTIONAL
                         PURPOSE "Needed for the remote mousepad plugin"
                         )
     if (LibFakeKey_FOUND)
         find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
         find_package(XTest REQUIRED)
         find_package(X11 REQUIRED)
         include_directories(${XTEST_INCLUDE_DIRS} ${X11_INCLUDE_DIR} ${LibFakeKey_INCLUDE_DIRS})
     endif()
 endif()
 
 set(HAVE_WINDOWS ${WIN32})
 set(HAVE_X11 ${LibFakeKey_FOUND})
 set(HAVE_WAYLAND ${KF5Wayland_FOUND})
 configure_file(config-mousepad.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-mousepad.h )
 
 kdeconnect_add_plugin(kdeconnect_mousepad JSON kdeconnect_mousepad.json SOURCES mousepadplugin.cpp abstractremoteinput.cpp)
 target_link_libraries(kdeconnect_mousepad kdeconnectcore Qt5::Gui KF5::I18n)
 
 
 if (HAVE_WINDOWS)
     target_sources(kdeconnect_mousepad PUBLIC windowsremoteinput.cpp)
 endif()
 
 if(HAVE_WAYLAND)
     target_sources(kdeconnect_mousepad PUBLIC waylandremoteinput.cpp)
     target_link_libraries(kdeconnect_mousepad KF5::WaylandClient)
 endif()
 
 if(HAVE_X11)
     target_sources(kdeconnect_mousepad PUBLIC x11remoteinput.cpp)
     target_link_libraries(kdeconnect_mousepad Qt5::X11Extras ${X11_LIBRARIES} ${XTEST_LIBRARIES} ${LibFakeKey_LIBRARIES})
 endif()