diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7848f5..aeb7772 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,58 +1,58 @@
 # Copyright (C) 2018 by Intevation GmbH <info@intevation.de>
 #
 # This file is Free Software under the GNU GPL (v>=2)
 # and comes with ABSOLUTELY NO WARRANTY!
 # See LICENSE.txt for details.
 
 cmake_minimum_required(VERSION 3.5.0)
 project(gpg4win-tools)
 set(PRETTY_NAME cryp.do)
 
 ### Generic Setup
 
 set(KF5_VERSION "5.43.0")
 set(GPGME_REQUIRED_VERSION "1.13.1")
 set(QT_REQUIRED_VERSION "5.6.0")
 set(LIBKLEO_VERSION "5.17.44")
 
 #Old qtmain linking behavior to be compatible with cmake versions < 2.8.11
 
 if(POLICY CMP0020)
   cmake_policy(SET CMP0020 OLD)
 endif()
 
 set(QT_MAJOR_VERSION "5")
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
 
 find_package(Gpgmepp ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
 find_package(QGpgme ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
-find_package(KF5Libkleo ${LIBKLEO_VERSION} CONFIG REQUIRED)
+find_package(KPim5Libkleo ${LIBKLEO_VERSION} CONFIG REQUIRED)
 find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 
 if(WIN32)
    add_definitions(-D_WIN32_WINNT=0x0600) # Windows vista
    add_definitions(-DWINVER=0x0600)
    add_definitions(-DUNICODE -D_UNICODE)
    add_definitions(-DMINGW_HAS_SECURE_API) # for _s functions
 endif(WIN32)
 
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 # Cmake does not correctly identify gcc windres when cross compiling
 # making this line neccessary to set the correct flags for it.
 # See: http://public.kitware.com/Bug/view.php?id=11773
 SET(CMAKE_RC_COMPILE_OBJECT
       "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -Ocoff <SOURCE> <OBJECT>")
 
 #add_subdirectory(img)
 ### Include the actual source directories
 add_subdirectory(src)
diff --git a/src/gpgcardgui/CMakeLists.txt b/src/gpgcardgui/CMakeLists.txt
index f461af2..e8001b5 100644
--- a/src/gpgcardgui/CMakeLists.txt
+++ b/src/gpgcardgui/CMakeLists.txt
@@ -1,33 +1,33 @@
 # Copyright (C) 2018 Intevation GmbH <info@intevation.de>
 #
 # This file is Free Software under the GNU GPL (v>=2)
 # and comes with ABSOLUTELY NO WARRANTY!
 # See LICENSE.txt for details.
 
 set(EXECUTABLE_NAME "gpgcardgui")
 
 set(EXECUTABLE_SRC
     main.cpp
     gpgcardgui.cpp
     mainwindow.cpp
     ${CMAKE_SOURCE_DIR}/src/util/strhelp.c
     ${CMAKE_SOURCE_DIR}/src/util/w32-gettext.c
 )
 
 add_executable(${EXECUTABLE_NAME}
     ${_add_executable_params}
     ${EXECUTABLE_SRC}
 )
 
 target_link_libraries(${EXECUTABLE_NAME}
     Qt5::Widgets
-    KF5::Libkleo
+    KPim5::Libkleo
     Gpgmepp
     QGpgme
 )
 
 if (WIN32)
    set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS "-municode")
 endif(WIN32)
 
 install(TARGETS ${EXECUTABLE_NAME} DESTINATION bin)
diff --git a/src/gpgolconfig/CMakeLists.txt b/src/gpgolconfig/CMakeLists.txt
index 24dbcff..d122551 100644
--- a/src/gpgolconfig/CMakeLists.txt
+++ b/src/gpgolconfig/CMakeLists.txt
@@ -1,42 +1,42 @@
 # Copyright (C) 2018 Intevation GmbH <info@intevation.de>
 #
 # This file is Free Software under the GNU GPL (v>=2)
 # and comes with ABSOLUTELY NO WARRANTY!
 # See LICENSE.txt for details.
 
 set(EXECUTABLE_NAME "gpgolconfig")
 
 set(EXECUTABLE_SRC
     main.cpp
     gpgolconfig-options.h
     gpgolconfig.cpp
     gpgolconfigpage.cpp
     gpgoldebugpage.cpp
     cryptoconfigpage.cpp
     ${CMAKE_SOURCE_DIR}/src/img/icon.rc
     ${CMAKE_SOURCE_DIR}/src/util/strhelp.c
     ${CMAKE_SOURCE_DIR}/src/util/w32-util.cpp
     ${CMAKE_SOURCE_DIR}/src/util/w32-qt-util.cpp
     ${CMAKE_SOURCE_DIR}/src/util/w32-gettext.c
 )
 
 qt5_add_resources(EXECUTABLE_SRC gpgolconfig.qrc)
 
 add_executable(${EXECUTABLE_NAME}
     ${_add_executable_params}
     ${EXECUTABLE_SRC}
 )
 
 target_link_libraries(${EXECUTABLE_NAME}
     Qt5::Widgets
     KF5::WidgetsAddons
-    KF5::Libkleo
+    KPim5::Libkleo
     Gpgmepp
     QGpgme
 )
 
 if (WIN32)
    set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS "-municode")
 endif(WIN32)
 
 install(TARGETS ${EXECUTABLE_NAME} DESTINATION bin)
diff --git a/src/resolver/CMakeLists.txt b/src/resolver/CMakeLists.txt
index 80f7bdc..092b78b 100644
--- a/src/resolver/CMakeLists.txt
+++ b/src/resolver/CMakeLists.txt
@@ -1,36 +1,36 @@
 # Copyright (C) 2018 Intevation GmbH <info@intevation.de>
 #
 # This file is Free Software under the GNU GPL (v>=2)
 # and comes with ABSOLUTELY NO WARRANTY!
 # See LICENSE.txt for details.
 
 set(EXECUTABLE_NAME "resolver")
 
 set(EXECUTABLE_SRC
     main.cpp
     resolver.cpp
     ${CMAKE_SOURCE_DIR}/src/img/icon.rc
     ${CMAKE_SOURCE_DIR}/src/util/overlay.cpp
     ${CMAKE_SOURCE_DIR}/src/util/w32-util.cpp
     ${CMAKE_SOURCE_DIR}/src/util/w32-qt-util.cpp
     ${CMAKE_SOURCE_DIR}/src/util/strhelp.c
 )
 
 add_executable(${EXECUTABLE_NAME}
     ${_add_executable_params}
     ${EXECUTABLE_SRC}
 )
 
 target_link_libraries(${EXECUTABLE_NAME}
     Qt5::Widgets
-    KF5::Libkleo
     KF5::IconThemes
+    KPim5::Libkleo
     Gpgmepp
     QGpgme
 )
 
 if (WIN32)
    set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS "-municode")
 endif(WIN32)
 
 install(TARGETS ${EXECUTABLE_NAME} DESTINATION bin)