diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ea212b..45e0215 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,106 +1,103 @@
 cmake_minimum_required(VERSION 3.5)
 set(PIM_VERSION "5.12.40")
 
 set(KGAPI_LIB_VERSION ${PIM_VERSION})
 
 project(kgapi VERSION ${KGAPI_LIB_VERSION})
 
 set(CMAKE_CXX_STANDARD 14)
 
 # ECM setup
-set(KF5_MIN_VERSION "5.62.0")
+set(KF5_MIN_VERSION "5.63.0")
 
 find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 include(ECMGeneratePriFile)
 
 include(ECMPoQmTools)
 include(ECMSetupVersion)
 include(FeatureSummary)
 
 set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT")
 
-set(KCALENDARCORE_LIB_VERSION "5.12.40")
-set(KCONTACTS_LIB_VERSION "5.12.40")
-
 ecm_setup_version(PROJECT
     VARIABLE_PREFIX KGAPI
     VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kgapi_version.h"
     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPimGAPIConfigVersion.cmake"
     SOVERSION 5
 )
 
 ############## Find Packages ##############
 set(QT_REQUIRED_VERSION "5.11.0")
 find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS
     Core
     Network
     Widgets
     WebEngineWidgets
     Xml
 )
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     KIO
     WindowSystem
     Wallet
 )
 
-find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG REQUIRED)
+find_package(KF5Contacts ${KF5_MIN_VERSION} CONFIG REQUIRED)
 
 find_package(Sasl2)
 set_package_properties(Sasl2 PROPERTIES TYPE REQUIRED)
 
 
 if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
    add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
 endif()
 
 
 ############## Targets ##############
 add_subdirectory(src)
 if (KGAPI_BUILD_EXAMPLES)
     add_subdirectory(examples)
 endif()
 if (BUILD_TESTING)
     add_subdirectory(autotests)
 endif()
 
 ############## CMake Config Files ##############
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPimGAPI")
 set(KGAPI_KF5_COMPAT FALSE)
 configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/KPimGAPIConfig.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/KPimGAPIConfig.cmake"
     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
 )
 
 install(FILES
     "${CMAKE_CURRENT_BINARY_DIR}/KPimGAPIConfig.cmake"
     "${CMAKE_CURRENT_BINARY_DIR}/KPimGAPIConfigVersion.cmake"
     DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
     COMPONENT Devel
 )
 
 install(EXPORT KPimGAPITargets
     DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
     FILE KPimGAPITargets.cmake
     NAMESPACE KPim::
 )
 
 install(FILES
     "${CMAKE_CURRENT_BINARY_DIR}/kgapi_version.h"
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim"
     COMPONENT Devel
 )
 
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/KPimGAPIConfig.cmake.in b/KPimGAPIConfig.cmake.in
index 3d0db46..366c296 100644
--- a/KPimGAPIConfig.cmake.in
+++ b/KPimGAPIConfig.cmake.in
@@ -1,18 +1,18 @@
 @PACKAGE_INIT@
 
 include(CMakeFindDependencyMacro)
 
-find_dependency(KF5CalendarCore "@KCALENDARCORE_LIB_VERSION@")
-find_dependency(KF5Contacts "@KCONTACTS_LIB_VERSION@")
+find_dependency(KF5CalendarCore "@KF5_MIN_VERSION@")
+find_dependency(KF5Contacts "@KF5_MIN_VERSION@")
 
 if (@KGAPI_KF5_COMPAT@)
     message(WARNING "\n"
                     "************* DEPRECATION WARNING *************\n"
                     "Using find_package(KF5GAPI) and KF5::GAPI* targets is deprecated. "
                     "Please use find_package(KPimGAPI) and KPim::GAPI* instead. This backwards "
                     "compatibility will be removed in the next major version.\n"
                     "***********************************************\n")
 endif()
 
 include("${CMAKE_CURRENT_LIST_DIR}/KPimGAPITargets.cmake")