diff --git a/app-crypt/gpgme/gpgme-1.23.2.recipe b/app-crypt/gpgme/gpgme-1.23.2.recipe
index e0292cbb0..8eedaa895 100644
--- a/app-crypt/gpgme/gpgme-1.23.2.recipe
+++ b/app-crypt/gpgme/gpgme-1.23.2.recipe
@@ -9,7 +9,7 @@ COPYRIGHT="1998-2020 Free Software Foundation, Inc.
 	2001-2023 g10 Code GmbH"
 LICENSE="GNU GPL v2
 	GNU LGPL v2.1"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-$portVersion.tar.bz2"
 CHECKSUM_SHA256="9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224"
 PATCHES="gpgme-$portVersion.patchset"
@@ -30,33 +30,53 @@ PROVIDES="
 	cmd:gpgme_tool$secondaryArchSuffix = $portVersion compat >= 1.17
 	lib:libgpgme$secondaryArchSuffix = $libgpgmeVersionCompat
 	lib:libgpgmepp$secondaryArchSuffix = $libgpgmeppVersionCompat
-	lib:libqgpgme$secondaryArchSuffix = $libqgpgmeVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libassuan$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libgpg_error$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	gpgme${secondaryArchSuffix}_devel = $portVersion compat >= 1.17
 	devel:libgpgme$secondaryArchSuffix = $libgpgmeVersionCompat
 	devel:libgpgmepp$secondaryArchSuffix = $libgpgmeppVersionCompat
-	devel:libqgpgme$secondaryArchSuffix = $libqgpgmeVersionCompat
 	"
 REQUIRES_devel="
 	gpgme$secondaryArchSuffix == $portVersion base
 	devel:libassuan$secondaryArchSuffix
 	"
 
+PROVIDES_qt5="
+	gpgme${secondaryArchSuffix}_qt5 = $portVersion compat >= 1.17
+	lib:libqgpgme$secondaryArchSuffix = $libqgpgmeVersionCompat
+	devel:libqgpgme$secondaryArchSuffix = $libqgpgmeVersionCompat
+	"
+REQUIRES_qt5="
+	$REQUIRES
+	gpgme$secondaryArchSuffix == $portVersion base
+	lib:libQt5Core$secondaryArchSuffix
+	"
+
+PROVIDES_qt6="
+	gpgme${secondaryArchSuffix}_qt6 = $portVersion compat >= 1.17
+	lib:libqgpgmeqt6$secondaryArchSuffix = $libqgpgmeVersionCompat
+	devel:libqgpgmeqt6$secondaryArchSuffix = $libqgpgmeVersionCompat
+	"
+REQUIRES_qt6="
+	$REQUIRES
+	gpgme$secondaryArchSuffix == $portVersion base
+	lib:libQt6Core$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libassuan$secondaryArchSuffix
 	devel:libglib_2.0$secondaryArchSuffix
 	devel:libgpg_error$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt6Core$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:autoreconf
@@ -74,14 +94,25 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	autoreconf -fi
+
+#	Building qt5 and qt6 bindings in the same source tree is not supported
+	cp -r $sourceDir ../qt6
+
 	runConfigure ./configure
 	make $jobArgs
+
+	cd ../qt6
+	runConfigure ./configure --enable-languages=cpp,qt6
+	make
 }
 
 INSTALL()
 {
 	make install
 
+	cd ../qt6
+	make install
+
 	local develPackageName="${portName}_devel-$portFullVersion"
 	local packageLinksDir=$(dirname $portPackageLinksDir)
 	local assuanLinksDir="$packageLinksDir/${develPackageName}/devel~libassuan$secondaryArchSuffix/$relativeDevelopLibDir"
@@ -91,17 +122,24 @@ INSTALL()
 
 	# fix lib path in cmake files
 	sed -i "s|$libDir|$developLibDir|" \
-		$libDir/cmake/QGpgme/QGpgmeConfig.cmake \
 		$libDir/cmake/Gpgmepp/GpgmeppConfig.cmake
 	sed -i "s|/packages/libassuan.*/lib|$assuanLinksDir|" \
-		$libDir/cmake/QGpgme/QGpgmeConfig.cmake \
 		$libDir/cmake/Gpgmepp/GpgmeppConfig.cmake
 
 	prepareInstalledDevelLibs libgpgme \
-		libgpgmepp \
-		libqgpgme
+		libgpgmepp
 	fixPkgconfig
 
+	# QT6
+	packageEntries "qt6" \
+		$libDir/libqgpgmeqt6* \
+		$libDir/cmake/QGpgmeQt6
+
+	# QT5
+	packageEntries "qt5" \
+		$libDir/libqgpgme* \
+		$libDir/cmake/QGpgme
+
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake