diff --git a/common/shlibs b/common/shlibs
index b7906b948b3..c96486911f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -511,7 +511,7 @@ libKPim6KSieveUi.so.6 libksieve-24.02.0_1
 libKPim6KManageSieve.so.6 libksieve-24.02.0_1
 libKPim5MailImporterAkonadi.so.5 mailimporter-23.04.0_1
 libKPim5MailImporter.so.5 mailimporter-23.04.0_1
-libKPim5MailCommon.so.5 mailcommon-23.04.0_1
+libKPim6MailCommon.so.6 mailcommon-24.02.0_1
 libKPim6Tnef.so.6 ktnef-24.02.0_1
 libKPim6AkonadiCalendar.so.6 akonadi-calendar-24.02.0_1
 libKPim6CalendarSupport.so.6 calendarsupport-24.02.0_1
diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index beaf94ae989..040b7ecec7b 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,19 +1,27 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=23.08.5
+version=24.02.2
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
- gettext qt5-host-tools python3 kgendesignerplugin"
-makedepends="mailimporter-devel messagelib-devel kdesignerplugin-devel
- pimcommon-devel libkleo-devel qt5-multimedia-devel kcontacts-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 kf6-kconfig libxslt qt6-base qt6-tools
+ gettext python3"
+makedepends="mailimporter-devel messagelib-devel kdesignerplugin-devel qt6-tools-devel
+ pimcommon-devel libkleo-devel qt6-multimedia-devel phonon-devel kf6-kcontacts-devel"
 checkdepends="dbus"
 short_desc="KDE PIM library providing support for mail applications"
 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/mailcommon-${version}.tar.xz"
-checksum=65dd3b8c9f8233fbdbde5a6f6f65539c061920e34140bd8f97d0efde5fd60fc0
+checksum=d2e6421838376b53d7fca9aa0663083b3b94f0209eb2fc5601ad612bee421604
+
+if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
+	broken="Qt6 WebEngine"
+fi
 
 do_check() {
 	cd build
@@ -28,7 +36,6 @@ mailcommon-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt5/mkspecs
 		vmove "usr/lib/*.so"
 	}
 }