diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 829107c082fcd..eaa464d4cc45b 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1 +1,2 @@
 DIST akonadi-25.04.3.tar.xz 1742704 BLAKE2B c16cbca45a2a0c5810934f1bfcc4d58a6a45378cd5f6dc061146b9407aa0c36c0dbfd0c2298c5cfb2980e37ba15d4cf31c63a7ec7dfb7bc9e501708af74572af SHA512 aec5ea9bcdfb5684c51d1923ebec184b5d31fdbfdf8eaae726a964b48e199f776c5d68727bf92c299f0c2f2affaa35b2a02a97b77cdada8aadbf83b93f8e0aa0
+DIST akonadi-25.08.0.tar.xz 1766664 BLAKE2B b166075bd206007bb3d55203de0a3de05d00b7a26602aa9aeae8b694ef8e45c8a7323045abdc17b2dc05a3b46a067a705d9f5ff8b78640157fccdc5120979ba0 SHA512 8f24469e0a3725c77fe900fed72bcfb701443b24b52a6d07d709066d768ac8dc89ee960301bd4248870191306ae6066d22fd23f6f13981c1032dd9dd1246492b
diff --git a/kde-apps/akonadi/akonadi-25.08.0.ebuild b/kde-apps/akonadi/akonadi-25.08.0.ebuild
new file mode 100644
index 0000000000000..97a1b5c547184
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-25.08.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+KFMIN=6.16.0
+QTMIN=6.9.1
+VIRTUALDBUS_TEST="true"
+inherit ecm gear.kde.org xdg
+
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
+HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
+
+LICENSE="LGPL-2.1+"
+SLOT="6/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64"
+IUSE="tools +webengine xml"
+
+REQUIRED_USE="test? ( tools )"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-arch/xz-utils
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	webengine? (
+		kde-apps/kaccounts-integration:6
+		>=net-libs/accounts-qt-1.17[qt6(+)]
+	)
+	xml? ( dev-libs/libxml2:= )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<app-office/merkuro-25.07.80
+	kde-apps/akonadi-config
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-open-agent-config.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TOOLS=$(usex tools)
+		$(cmake_use_find_package webengine AccountsQt6)
+		$(cmake_use_find_package webengine KAccounts6)
+		$(cmake_use_find_package xml LibXml2)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/akonadi/files/akonadi-25.08.0-fix-open-agent-config.patch b/kde-apps/akonadi/files/akonadi-25.08.0-fix-open-agent-config.patch
new file mode 100644
index 0000000000000..05150d0fd666c
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-25.08.0-fix-open-agent-config.patch
@@ -0,0 +1,25 @@
+From 8a2dfd13b3c4730636a962121368d49c57f79273 Mon Sep 17 00:00:00 2001
+From: Tobias Fella <tobias.fella@kde.org>
+Date: Fri, 25 Jul 2025 15:50:15 +0200
+Subject: [PATCH] Fix opening agent configuration
+
+---
+ src/quick/qml/AgentConfigurationForm.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/quick/qml/AgentConfigurationForm.qml b/src/quick/qml/AgentConfigurationForm.qml
+index 374e3a573..335c62d7c 100644
+--- a/src/quick/qml/AgentConfigurationForm.qml
++++ b/src/quick/qml/AgentConfigurationForm.qml
+@@ -25,7 +25,7 @@ FormCard.FormCard {
+     Components.MessageDialog {
+         id: dialog
+ 
+-        property Item agentDelegate
++        property var agentDelegate
+ 
+         title: i18ndc("libakonadi6", "@title:dialog", "Configure %1", agentDelegate?.name)
+         parent: root.QQC2.Overlay.overlay
+-- 
+GitLab
+