diff --git a/CMakeLists.txt b/CMakeLists.txt
index 632f9ea7..89932ed5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,130 +1,130 @@
 project(kdepim-addons)
 
 cmake_minimum_required(VERSION 3.1)
 if (POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
 endif()
 
 set(KF5_VERSION "5.31.0")
 find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 # Do NOT add quote
 set(KDEPIMADDONS_DEV_VERSION pre)
 
 # add an extra space
 if(DEFINED KDEPIMADDONS_DEV_VERSION)
     set(KDEPIMADDONS_DEV_VERSION " ${KDEPIMADDONS_DEV_VERSION}")
 endif()
 
 set(PIM_VERSION "5.4.42")
 
 set(KDEPIMADDONS_VERSION_NUMBER ${PIM_VERSION})
 set(KDEPIMADDONS_VERSION "${KDEPIMADDONS_VERSION_NUMBER}${KDEPIMADDONS_DEV_VERSION}")
 
 set(KDEPIMADDONS_LIB_VERSION "${KDEPIMADDONS_VERSION_NUMBER}")
 set(KDEPIMADDONS_LIB_SOVERSION "5")
 
 set(AKONADINOTES_LIB_VERSION "5.4.40")
 set(QT_REQUIRED_VERSION "5.6.0")
 include(ECMOptionalAddSubdirectory)
 include(ECMInstallIcons)
 include(ECMSetupVersion)
 include(ECMAddTests)
 include(ECMMarkNonGuiExecutable)
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 include(CMakePackageConfigHelpers)
 include(FeatureSummary)
 include(CheckFunctionExists)
 include(ECMGeneratePriFile)
 include(ECMCoverageOption)
 
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMAddAppIcon)
 include(ECMQtDeclareLoggingCategory)
 
 option(KDEPIMADDONS_BUILD_EXAMPLES "Build the kdepim-addons example applications." TRUE)
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets Widgets Test)
 
 find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiNotes ${AKONADINOTES_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Declarative ${KF5_VERSION} CONFIG REQUIRED)
 
 set(MAILCOMMON_LIB_VERSION "5.4.40")
 set(GRAVATAR_LIB_VERSION "5.4.40")
 set(PIMCOMMON_LIB_VERSION "5.4.43")
 set(GRANTLEETHEME_LIB_VERSION "5.4.40")
 set(CALENDARSUPPORT_LIB_VERSION "5.4.40")
 set(EVENTVIEW_LIB_VERSION "5.4.40")
 set(LIBKDEPIM_LIB_VERSION "5.4.40")
 set(KDEPIM_APPS_LIB_VERSION "5.4.40")
 set(LIBKLEO_LIB_VERSION "5.4.40")
 set(AKONADI_LIB_VERSION "5.4.40")
 set(INCIDENCEEDITOR_LIB_VERSION "5.4.40")
 set(KTNEF_LIB_VERSION "5.4.40")
 set(MESSAGELIB_LIB_VERSION "5.4.42")
 set(AKONADICALENDAR_LIB_VERSION "5.4.40")
 set(CALENDAR_UTILS_VERSION "5.4.40")
 set(KPIMTEXTEDIT_LIB_VERSION "5.4.40")
 set(KIMAP_LIB_VERSION "5.4.40")
 set(LIBKSIEVE_LIB_VERSION_LIB "5.4.50")
 set(KMAILTRANSPORT_LIB_VERSION "5.4.40")
 
 find_package(KF5CalendarUtils ${CALENDAR_UTILS_VERSION} CONFIG REQUIRED)
 find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5KaddressbookImportExport ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5IncidenceEditor ${INCIDENCEEDITOR_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MessageCore ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MessageComposer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MessageList ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Akonadi ${AKONADI_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Gravatar ${GRAVATAR_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5IdentityManagement ${KIDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5LibKSieve ${LIBKSIEVE_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5Tnef ${KTNEF_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MailTransport ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
 
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 # Extra package
-find_package(KF5GAPI "5.3.1" CONFIG)
+find_package(KPimGAPI "5.4.40" CONFIG)
 
 find_package(Gpgmepp 1.8.0 CONFIG)
 set_package_properties(Gpgmepp PROPERTIES DESCRIPTION "GpgME library" URL "http://www.gnupg.org" TYPE REQUIRED)
 
 
 if (KDEPIMADDONS_BUILD_EXAMPLES)
     add_subdirectory(examples)
 endif()
 
 add_subdirectory(plugins)
 add_subdirectory(korganizer)
 add_subdirectory(kmail)
 add_subdirectory(kaddressbook)
 add_subdirectory(akregator)
 add_subdirectory(sieveeditor)
 
 install( FILES kdepim-addons.categories kdepim-addons.renamecategories DESTINATION ${KDE_INSTALL_CONFDIR} )
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)