diff --git a/common/shlibs b/common/shlibs
index 28ec8da8220..f04012cd370 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -496,13 +496,13 @@ libKSaneWidgets6.so.6 libksane6-24.02.0_1
 libKPim5SMTP.so.5 ksmtp-23.04.0_1
 libKPim6MailTransport.so.6 kmailtransport-24.02.0_1
 libKPim6Mbox.so.6 kmbox-24.02.0_1
-libKPim5MessageComposer.so.5 messagelib-23.04.0_1
-libKPim5MessageList.so.5 messagelib-23.04.0_1
-libKPim5TemplateParser.so.5 messagelib-23.04.0_1
-libKPim5WebEngineViewer.so.5 messagelib-23.04.0_1
-libKPim5MessageCore.so.5 messagelib-23.04.0_1
-libKPim5MimeTreeParser.so.5 messagelib-23.04.0_1
-libKPim5MessageViewer.so.5 messagelib-23.04.0_1
+libKPim6MessageComposer.so.6 messagelib-24.02.0_1
+libKPim6MessageList.so.6 messagelib-24.02.0_1
+libKPim6TemplateParser.so.6 messagelib-24.02.0_1
+libKPim6WebEngineViewer.so.6 messagelib-24.02.0_1
+libKPim6MessageCore.so.6 messagelib-24.02.0_1
+libKPim6MimeTreeParser.so.6 messagelib-23.04.0_1
+libKPim6MessageViewer.so.6 messagelib-23.04.0_1
 libKPim6CalendarUtils.so.6 kcalutils-24.02.0_1
 libKPim5KontactInterface.so.5 kontactinterface-23.04.0_1
 libKPim6KSieve.so.6 libksieve-24.02.0_1
diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 2f37f92a01e..90bc6a20dce 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,24 +1,30 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
- gettext kcoreaddons kconfig"
-makedepends="akonadi-contacts-devel gpgmeqt-devel
+configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
+ -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
+ -DKDE_INSTALL_QMLDIR=lib/qt6/qml
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs/modules"
+hostmakedepends="extra-cmake-modules qt6-base qt6-tools python3
+ gettext kf6-kcoreaddons kf6-kconfig"
+makedepends="akonadi-contacts-devel gpgme-qt6-devel
  kidentitymanagement-devel kmailtransport-devel kmbox-devel libgravatar-devel
- libkdepim-devel qt5-location-devel qt5-webchannel-devel qt5-webengine-devel
- qca-qt5-devel pimcommon-devel knewstuff-devel"
+ libkdepim-devel qt6-webchannel-devel qt6-webengine-devel
+ pimcommon-devel kf6-knewstuff-devel"
 checkdepends="procps-ng gnupg dbus"
 short_desc="KDE PIM messaging library"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=da37af29e9a1a8d5947cbdc7ccfbdd749d3ef5257e4cc778eb8f0069fe50ddf8
+checksum=231d9a7a63b60183bd57ad1d372590f456549678a8a4aab1f8e6b0d844feec5d
 make_check_pre="dbus-run-session"
 
-#TODO: fix build without qca-qt5
+if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
+	broken="Qt6 WebEngine"
+fi
 
 do_check() {
 	cd build
@@ -56,7 +62,6 @@ messagelib-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/qt5/mkspecs
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}