diff --git a/kde-apps/akonadi-calendar/akonadi_calendar-22.04.3.recipe b/kde-apps/akonadi-calendar/akonadi_calendar-23.08.5.recipe
similarity index 68%
rename from kde-apps/akonadi-calendar/akonadi_calendar-22.04.3.recipe
rename to kde-apps/akonadi-calendar/akonadi_calendar-23.08.5.recipe
index 2df756334..500df65ad 100644
--- a/kde-apps/akonadi-calendar/akonadi_calendar-22.04.3.recipe
+++ b/kde-apps/akonadi-calendar/akonadi_calendar-23.08.5.recipe
@@ -11,16 +11,15 @@ Akonadi::Item and other features.
 Besides the model there is for example Akonadi::FreeBusyProviderBase, an interface for Akonadi \
 Resources that can provide Free/Busy information."
 HOMEPAGE="https://community.kde.org/KDE_PIM"
-COPYRIGHT="2010-2022 KDE Organisation"
+COPYRIGHT="2010-2024 KDE Organisation"
 LICENSE="BSD (3-clause)
 	CC0 v1.0
 	GNU LGPL v2
 	GNU LGPL v2.1"
 REVISION="1"
-SOURCE_URI="https://download.kde.org/Attic/release-service/$portVersion/src/akonadi-calendar-$portVersion.tar.xz"
-CHECKSUM_SHA256="e4fd0bbcca26a9660ca3902fd1d04b593f222893171e5f5310a75de82f148c41"
+SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/akonadi-calendar-$portVersion.tar.xz"
+CHECKSUM_SHA256="cf8da9409412ed3348ee4a8ab9e2df8ecf844070f84c8cdbf0b6f4c8269339ca"
 SOURCE_DIR="akonadi-calendar-$portVersion"
-PATCHES="akonadi_calendar-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -36,24 +35,21 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
-libVersion="5.20.3"
+libVersion="5.24.5"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	akonadi_calendar$secondaryArchSuffix = $portVersion
 	cmd:kalendarac$commandSuffix = $portVersion
-	lib:libKF5AkonadiCalendar$secondaryArchSuffix = $libVersionCompat
+	lib:libKPim5AkonadiCalendar$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libassuan$secondaryArchSuffix
+	lib:libgpgmepp$secondaryArchSuffix
 	lib:libGrantlee_Templates$secondaryArchSuffix
-	lib:libKF5AkonadiContact$secondaryArchSuffix
-	lib:libKF5AkonadiCore$secondaryArchSuffix
-	lib:libKF5AkonadiWidgets$secondaryArchSuffix
-	lib:libKF5AkonadiMime$secondaryArchSuffix
 	lib:libKF5Auth$secondaryArchSuffix
 	lib:libKF5CalendarCore$secondaryArchSuffix
-	lib:libKF5CalendarUtils$secondaryArchSuffix
 	lib:libKF5Codecs$secondaryArchSuffix
 	lib:libKF5Completion$secondaryArchSuffix
 	lib:libKF5Contacts$secondaryArchSuffix
@@ -61,22 +57,35 @@ REQUIRES="
 	lib:libKF5ConfigWidgets$secondaryArchSuffix
 	lib:libKF5CoreAddons$secondaryArchSuffix
 	lib:libKF5DBusAddons$secondaryArchSuffix
-	lib:libKF5GrantleeTheme$secondaryArchSuffix
 	lib:libKF5I18n$secondaryArchSuffix
-	lib:libKF5IdentityManagement$secondaryArchSuffix
 	lib:libKF5ItemModels$secondaryArchSuffix
 	lib:libKF5KIOCore$secondaryArchSuffix
 	lib:libKF5JobWidgets$secondaryArchSuffix
-	lib:libKF5MailTransport$secondaryArchSuffix
-	lib:libKF5MailTransportAkonadi$secondaryArchSuffix
-	lib:libKF5Mime$secondaryArchSuffix
 	lib:libKF5Notifications$secondaryArchSuffix
 	lib:libKF5Service$secondaryArchSuffix
 	lib:libKF5Solid$secondaryArchSuffix
+	lib:libKF5TextAutoCorrectionWidgets$secondaryArchSuffix
+	lib:libKF5TextWidgets$secondaryArchSuffix
 	lib:libKF5Wallet$secondaryArchSuffix
 	lib:libKF5WidgetsAddons$secondaryArchSuffix
 	lib:libKF5WindowSystem$secondaryArchSuffix
 	lib:libKF5XmlGui$secondaryArchSuffix
+	lib:libKPim5AkonadiContact$secondaryArchSuffix
+	lib:libKPim5AkonadiCore$secondaryArchSuffix
+	lib:libKPim5AkonadiWidgets$secondaryArchSuffix
+	lib:libKPim5AkonadiMime$secondaryArchSuffix
+	lib:libKPim5CalendarUtils$secondaryArchSuffix
+	lib:libKPim5GrantleeTheme$secondaryArchSuffix
+	lib:libKPim5IdentityManagement$secondaryArchSuffix
+	lib:libKPim5IMAP$secondaryArchSuffix
+	lib:libKPim5Libkleo$secondaryArchSuffix
+	lib:libKPim5Libkdepim$secondaryArchSuffix
+	lib:libKPim5MailTransport$secondaryArchSuffix
+	lib:libKPim5Mime$secondaryArchSuffix
+	lib:libKPim5MessageCore$secondaryArchSuffix
+	lib:libKPim5PimCommon$secondaryArchSuffix
+	lib:libKPim5PimCommonAkonadi$secondaryArchSuffix
+	lib:libKPim5TextEdit$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5DBus$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
@@ -87,7 +96,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	akonadi_calendar${secondaryArchSuffix}_devel = $portVersion
-	devel:libKF5AkonadiCalendar$secondaryArchSuffix = $libVersionCompat
+	devel:libKPim5AkonadiCalendar$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	akonadi_calendar$secondaryArchSuffix == $portVersion base
@@ -95,15 +104,13 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= 5.93.0
+	extra_cmake_modules$secondaryArchSuffix >= 5.115
+	devel:libassuan$secondaryArchSuffix
+	devel:libgpgmepp$secondaryArchSuffix
 	devel:libGrantlee_Templates$secondaryArchSuffix
-	devel:libKF5AkonadiContact$secondaryArchSuffix
-	devel:libKF5AkonadiCore$secondaryArchSuffix
-	devel:libKF5AkonadiMime$secondaryArchSuffix
 	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
 	devel:libKF5CalendarCore$secondaryArchSuffix
-	devel:libKF5CalendarUtils$secondaryArchSuffix
 	devel:libKF5Codecs$secondaryArchSuffix
 	devel:libKF5Completion$secondaryArchSuffix
 	devel:libKF5Contacts$secondaryArchSuffix
@@ -111,27 +118,37 @@ BUILD_REQUIRES="
 	devel:libKF5ConfigWidgets$secondaryArchSuffix
 	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5DBusAddons$secondaryArchSuffix
-	devel:libKF5GrantleeTheme$secondaryArchSuffix
 	devel:libKF5I18n$secondaryArchSuffix
 	devel:libKF5IconThemes$secondaryArchSuffix
-	devel:libKF5IdentityManagement$secondaryArchSuffix
 	devel:libKF5ItemModels$secondaryArchSuffix
 	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5JobWidgets$secondaryArchSuffix
 	devel:libKF5KIOCore$secondaryArchSuffix
-	devel:libKF5MailTransportAkonadi$secondaryArchSuffix
-	devel:libKF5Mime$secondaryArchSuffix
 	devel:libKF5Notifications$secondaryArchSuffix
 	devel:libKF5NotifyConfig$secondaryArchSuffix
-	devel:libKF5PimTextEdit$secondaryArchSuffix
 	devel:libKF5Service$secondaryArchSuffix
 	devel:libKF5Solid$secondaryArchSuffix
 	devel:libKF5SonnetCore$secondaryArchSuffix
+	devel:libKF5TextAutoCorrectionWidgets$secondaryArchSuffix
 	devel:libKF5TextWidgets$secondaryArchSuffix
 	devel:libKF5Wallet$secondaryArchSuffix
 	devel:libKF5WidgetsAddons$secondaryArchSuffix
 	devel:libKF5WindowSystem$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
+	devel:libKPim5AkonadiContact$secondaryArchSuffix
+	devel:libKPim5AkonadiCore$secondaryArchSuffix
+	devel:libKPim5AkonadiMime$secondaryArchSuffix
+	devel:libKPim5CalendarUtils$secondaryArchSuffix
+	devel:libKPim5GrantleeTheme$secondaryArchSuffix
+	devel:libKPim5Libkdepim$secondaryArchSuffix
+	devel:libKPim5Libkleo$secondaryArchSuffix
+	devel:libKPim5IdentityManagement$secondaryArchSuffix
+	devel:libKPim5IMAP$secondaryArchSuffix
+	devel:libKPim5Mime$secondaryArchSuffix
+	devel:libKPim5MailTransport$secondaryArchSuffix
+	devel:libKPim5MessageCore$secondaryArchSuffix
+	devel:libKPim5PimCommon$secondaryArchSuffix
+	devel:libKPim5TextEdit$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5DBus$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
@@ -155,8 +172,8 @@ PATCH()
 
 BUILD()
 {
-	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
-		$cmakeDirArgs \
+	cmake -Bbuild -S. $cmakeDirArgs \
+		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
@@ -171,7 +188,7 @@ INSTALL()
 	make -C build install
 
 	prepareInstalledDevelLib \
-		libKF5AkonadiCalendar
+		libKPim5AkonadiCalendar
 
 	packageEntries devel \
 		$libDir/cmake \
diff --git a/kde-apps/akonadi-calendar/patches/akonadi_calendar-22.04.3.patchset b/kde-apps/akonadi-calendar/patches/akonadi_calendar-22.04.3.patchset
deleted file mode 100644
index 7b7543d2a..000000000
--- a/kde-apps/akonadi-calendar/patches/akonadi_calendar-22.04.3.patchset
+++ /dev/null
@@ -1,27 +0,0 @@
-From 458fd5ea1b2e16a5d387ff1ffd6a3c89bfcf8705 Mon Sep 17 00:00:00 2001
-From: Begasus <begasus@gmail.com>
-Date: Tue, 18 Jul 2023 17:26:16 +0000
-Subject: Fix error message on launch
-
-
-diff --git a/reminder-daemon/kalendaracmain.cpp b/reminder-daemon/kalendaracmain.cpp
-index 0566c7f..6c3635e 100644
---- a/reminder-daemon/kalendaracmain.cpp
-+++ b/reminder-daemon/kalendaracmain.cpp
-@@ -12,10 +12,12 @@
- 
- int main(int argc, char **argv)
- {
-+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-+#endif
-     QGuiApplication app(argc, argv);
-     app.setQuitOnLastWindowClosed(false);
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
--    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
- #endif
- 
--- 
-2.37.3
-