diff --git a/CMakeLists.txt b/CMakeLists.txt
index dac37d634..c96a3e6db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,19 +43,19 @@ endif()
 set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 
-set(AKONADI_MIMELIB_VERSION "5.8.40")
-set(AKONADI_CONTACT_VERSION "5.8.40")
-set(KCONTACTS_LIB_VERSION "5.8.40")
-set(KCALENDARCORE_LIB_VERSION "5.8.40")
-set(CALENDARUTILS_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(KONTACTINTERFACE_LIB_VERSION "5.8.41")
-set(KMIME_LIB_VERSION "5.8.40")
-set(KPIMTEXTEDIT_LIB_VERSION "5.8.40")
-set(AKONADI_VERSION "5.8.40")
-set(KTNEF_LIB_VERSION "5.8.40")
+set(AKONADI_MIMELIB_VERSION "5.8.80")
+set(AKONADI_CONTACT_VERSION "5.8.80")
+set(KCONTACTS_LIB_VERSION "5.8.80")
+set(KCALENDARCORE_LIB_VERSION "5.8.80")
+set(CALENDARUTILS_LIB_VERSION "5.8.80")
+set(IDENTITYMANAGEMENT_LIB_VERSION "5.8.80")
+set(KLDAP_LIB_VERSION "5.8.80")
+set(KMAILTRANSPORT_LIB_VERSION "5.8.80")
+set(KONTACTINTERFACE_LIB_VERSION "5.8.80")
+set(KMIME_LIB_VERSION "5.8.80")
+set(KPIMTEXTEDIT_LIB_VERSION "5.8.80")
+set(AKONADI_VERSION "5.8.80")
+set(KTNEF_LIB_VERSION "5.8.80")
 
 set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
 set(KDEPIM_LIB_SOVERSION "5")
@@ -64,18 +64,18 @@ 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 Network Test Widgets WebEngine WebEngineWidgets)
-set(LIBGRAVATAR_VERSION_LIB "5.8.40")
-set(MAILCOMMON_LIB_VERSION_LIB "5.8.40")
-set(KDEPIM_APPS_LIB_VERSION_LIB "5.8.40")
-set(MESSAGELIB_LIB_VERSION_LIB "5.8.45")
-set(LIBKLEO_LIB_VERSION_LIB "5.8.40")
-set(PIMCOMMON_LIB_VERSION_LIB "5.8.40")
-set(LIBKDEPIM_LIB_VERSION_LIB "5.8.40")
-set(LIBKSIEVE_LIB_VERSION_LIB "5.8.40")
+set(LIBGRAVATAR_VERSION_LIB "5.8.80")
+set(MAILCOMMON_LIB_VERSION_LIB "5.8.80")
+set(KDEPIM_APPS_LIB_VERSION_LIB "5.8.80")
+set(MESSAGELIB_LIB_VERSION_LIB "5.8.80")
+set(LIBKLEO_LIB_VERSION_LIB "5.8.80")
+set(PIMCOMMON_LIB_VERSION_LIB "5.8.80")
+set(LIBKDEPIM_LIB_VERSION_LIB "5.8.80")
+set(LIBKSIEVE_LIB_VERSION_LIB "5.8.80")
 
 find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
 
-find_package(KF5AkonadiSearch "5.8.40" CONFIG REQUIRED)
+find_package(KF5AkonadiSearch "5.8.80" 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")
 
 set(GPGMEPP_LIB_VERSION "1.8.0")