diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f47a919..df375a90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,141 +1,141 @@
 cmake_minimum_required(VERSION 3.1)
 # Do NOT add quote
 set(KDEPIM_DEV_VERSION alpha)
 
 # add an extra space
 if(DEFINED KDEPIM_DEV_VERSION)
   set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
 endif()
 
 set(KDEPIM_VERSION_NUMBER "5.8.40")
 set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 project(korganizer VERSION ${KDEPIM_VERSION_NUMBER})
 
 if(POLICY CMP0063)
   cmake_policy(SET CMP0063 NEW)
 endif()
 set(KF5_VERSION "5.46.0")
 
 find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 include(ECMOptionalAddSubdirectory)
 include(ECMInstallIcons)
 include(ECMSetupVersion)
 include(ECMAddTests)
 include(ECMMarkNonGuiExecutable)
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 include(CMakePackageConfigHelpers)
 include(FeatureSummary)
 include(CheckFunctionExists)
 include(ECMGeneratePriFile)
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMAddAppIcon)
 include(ECMQtDeclareLoggingCategory)
 include(ECMCoverageOption)
 
-set(AKONADI_MIMELIB_VERSION "5.7.80")
-set(AKONADI_CONTACT_VERSION "5.7.80")
-set(KCALENDARCORE_LIB_VERSION "5.7.80")
-set(IDENTITYMANAGEMENT_LIB_VERSION "5.7.80")
-set(KLDAP_LIB_VERSION "5.7.80")
-set(KMAILTRANSPORT_LIB_VERSION "5.7.80")
-set(CALENDARUTILS_LIB_VERSION "5.7.80")
-set(AKONADICALENDAR_LIB_VERSION "5.7.80")
-set(KONTACTINTERFACE_LIB_VERSION "5.7.80")
-set(KMIME_LIB_VERSION "5.7.80")
-set(KPIMTEXTEDIT_LIB_VERSION "5.7.80")
-set(AKONADI_VERSION "5.7.80")
+set(AKONADI_MIMELIB_VERSION "5.8.40")
+set(AKONADI_CONTACT_VERSION "5.8.40")
+set(KCALENDARCORE_LIB_VERSION "5.8.40")
+set(IDENTITYMANAGEMENT_LIB_VERSION "5.8.40")
+set(KLDAP_LIB_VERSION "5.8.40")
+set(KMAILTRANSPORT_LIB_VERSION "5.8.40")
+set(CALENDARUTILS_LIB_VERSION "5.8.40")
+set(AKONADICALENDAR_LIB_VERSION "5.8.40")
+set(KONTACTINTERFACE_LIB_VERSION "5.8.40")
+set(KMIME_LIB_VERSION "5.8.40")
+set(KPIMTEXTEDIT_LIB_VERSION "5.8.40")
+set(AKONADI_VERSION "5.8.40")
 
 set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
 set(KDEPIM_LIB_SOVERSION "5")
-set(AKONADINOTES_LIB_VERSION "5.7.80")
+set(AKONADINOTES_LIB_VERSION "5.8.40")
 
 set(QT_REQUIRED_VERSION "5.9.0")
 option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Gui Widgets Test UiTools)
-set(KDEPIM_APPS_LIB_VERSION_LIB "5.7.80")
-set(PIMCOMMON_LIB_VERSION_LIB "5.7.80")
-set(LIBKDEPIM_LIB_VERSION_LIB "5.7.80")
-set(LIBINCIDENCEEDITOR_LIB_VERSION_LIB "5.7.80")
+set(KDEPIM_APPS_LIB_VERSION_LIB "5.8.40")
+set(PIMCOMMON_LIB_VERSION_LIB "5.8.40")
+set(LIBKDEPIM_LIB_VERSION_LIB "5.8.40")
+set(LIBINCIDENCEEDITOR_LIB_VERSION_LIB "5.8.40")
 set(CALENDARSUPPORT_LIB_VERSION_LIB "5.8.41")
 set(EVENTVIEW_LIB_VERSION_LIB "5.8.41")
-set(KCONTACTS_LIB_VERSION "5.7.80")
+set(KCONTACTS_LIB_VERSION "5.8.40")
 
-find_package(KF5AkonadiSearch "5.7.80" CONFIG REQUIRED)
+find_package(KF5AkonadiSearch "5.8.40" CONFIG REQUIRED)
 set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
 
 # Find KF5 package
 find_package(KF5Codecs ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5CoreAddons ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Crash ${KF5_VERSION} REQUIRED)
 find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
 find_package(KF5IconThemes ${KF5_VERSION} REQUIRED)
 find_package(KF5ItemViews ${KF5_VERSION} REQUIRED)
 find_package(KF5JobWidgets ${KF5_VERSION} REQUIRED)
 find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5NewStuff ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Parts ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Service ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5WindowSystem ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Notifications ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Holidays ${KF5_VERSION} CONFIG REQUIRED)
 
 # Find KdepimLibs Package
 find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
 find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
 find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MailTransportAkonadi ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
 find_package(KF5CalendarUtils ${CALENDARUTILS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED)
 find_package(Phonon4Qt5 CONFIG REQUIRED)
 
 find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiNotes ${AKONADINOTES_LIB_VERSION} CONFIG REQUIRED)
 
 find_package(KF5KdepimDBusInterfaces ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5IncidenceEditor ${LIBINCIDENCEEDITOR_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION_LIB} CONFIG REQUIRED)
 if(NOT APPLE)
   find_package(X11)
 endif()
 
 set(KDEPIM_HAVE_X11 ${X11_FOUND})
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 configure_file(config-korganizer.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-korganizer.h)
 configure_file(korgac/config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-enterprise.h)
 include_directories(${korganizer_SOURCE_DIR} ${korganizer_BINARY_DIR} ${korgac_SOURCE_DIR} ${korgac_BINARY_DIR})
 configure_file(korganizer-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/korganizer-version.h @ONLY)
 
 add_definitions(-DQT_NO_CAST_FROM_ASCII)
 add_definitions(-DQT_NO_CAST_TO_ASCII)
 add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
 add_subdirectory(src)
 add_subdirectory(korgac)
 
 install(FILES korganizer.renamecategories korganizer.categories DESTINATION ${KDE_INSTALL_CONFDIR})
 
 add_subdirectory(doc)
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)