diff --git a/net-libs/libquotient/libquotient-0.6.11.recipe b/net-libs/libquotient/libquotient-0.6.11.recipe
deleted file mode 100644
index f21ebe8b3..000000000
--- a/net-libs/libquotient/libquotient-0.6.11.recipe
+++ /dev/null
@@ -1,79 +0,0 @@
-SUMMARY="A Qt5 library to write cross-platform clients for Matrix"
-DESCRIPTION="The Quotient project aims to produce a Qt5-based SDK to develop \
-applications for Matrix.
-libQuotient is a library that enables client applications.
-It is the backbone of Quaternion, NeoChat and other projects.
-Versions 0.5.x and older use the previous name - libQMatrixClient."
-HOMEPAGE="https://github.com/quotient-im/libQuotient"
-COPYRIGHT="Quotient contributors"
-LICENSE="GNU LGPL v2.1"
-REVISION="2"
-SOURCE_URI="https://github.com/quotient-im/libQuotient/archive/refs/tags/$portVersion.tar.gz"
-CHECKSUM_SHA256="12b15d1296e630477d5e8f4d32c821dc724b3c5b99d15d383417ba7d88f03c46"
-SOURCE_DIR="libQuotient-$portVersion"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-libVersion="$portVersion"
-libVersionCompat="$libVersion compat >= ${libVersion%.*}"
-
-PROVIDES="
-	libquotient$secondaryArchSuffix = $portVersion
-	lib:libQuotient$secondaryArchSuffix = $libVersionCompat
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Multimedia$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libquotient${secondaryArchSuffix}_devel = $portVersion
-	devel:libQuotient$secondaryArchSuffix = $libVersionCompat
-	"
-REQUIRES_devel="
-	libquotient$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libQt5Core$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:qdbuscpp2xml$secondaryArchSuffix >= 5
-	"
-
-BUILD()
-{
-	cmake -B build \
-		$cmakeDirArgs \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON \
-		-DQuotient_INSTALL_TESTS=OFF \
-		-DQuotient_ENABLE_E2EE=OFF \
-		-DBUILD_SHARED_LIBS=ON
-
-	cmake --build build --target all
-}
-
-INSTALL()
-{
-	cmake --install build
-
-	# get rid of share dir with Android.mk
-	rm -rf $prefix/share
-
-	prepareInstalledDevelLib \
-		libQuotient
-	fixPkgconfig
-
-	packageEntries devel \
-		$developDir \
-		$libDir/cmake
-}
diff --git a/net-libs/libquotient/libquotient_qt6-0.8.2.recipe b/net-libs/libquotient/libquotient0.8_qt6-0.8.2.recipe
similarity index 87%
rename from net-libs/libquotient/libquotient_qt6-0.8.2.recipe
rename to net-libs/libquotient/libquotient0.8_qt6-0.8.2.recipe
index ffabce9e9..9bb757076 100644
--- a/net-libs/libquotient/libquotient_qt6-0.8.2.recipe
+++ b/net-libs/libquotient/libquotient0.8_qt6-0.8.2.recipe
@@ -7,7 +7,7 @@ Versions 0.5.x and older use the previous name - libQMatrixClient."
 HOMEPAGE="https://github.com/quotient-im/libQuotient"
 COPYRIGHT="Quotient contributors"
 LICENSE="GNU LGPL v2.1"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/quotient-im/libQuotient/archive/refs/tags/$portVersion.tar.gz"
 CHECKSUM_SHA256="12ff2fa8b80a934b9dd88fa3416a4b88e94bc0e18a8df0dcebfc90614dd2f5c9"
 SOURCE_DIR="libQuotient-$portVersion"
@@ -19,7 +19,7 @@ libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%.*}"
 
 PROVIDES="
-	libquotient_qt6$secondaryArchSuffix = $portVersion
+	libquotient0.8_qt6$secondaryArchSuffix = $portVersion
 	lib:libQuotientQt6$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -33,15 +33,21 @@ REQUIRES="
 	lib:libQt6Multimedia$secondaryArchSuffix
 	lib:libQt6Network$secondaryArchSuffix
 	"
-
+REPLACES="
+	libquotient_qt6$secondaryArchSuffix
+	"
+	
 PROVIDES_devel="
-	libquotient_qt6${secondaryArchSuffix}_devel = $portVersion
+	libquotient0.8_qt6${secondaryArchSuffix}_devel = $portVersion
 	devel:libQuotientQt6$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	libquotient_qt6$secondaryArchSuffix == $portVersion base
+	libquotient0.8_qt6$secondaryArchSuffix == $portVersion base
 	devel:libQt6Keychain$secondaryArchSuffix
 	"
+CONFLICTS_devel="
+	libquotient0.9_qt6${secondaryArchSuffix}_devel
+	" 
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
diff --git a/net-libs/libquotient/libquotient0.9_qt6-0.9.0.recipe b/net-libs/libquotient/libquotient0.9_qt6-0.9.0.recipe
new file mode 100644
index 000000000..9748fb979
--- /dev/null
+++ b/net-libs/libquotient/libquotient0.9_qt6-0.9.0.recipe
@@ -0,0 +1,92 @@
+SUMMARY="A Qt6 library to write cross-platform clients for Matrix"
+DESCRIPTION="The Quotient project aims to produce a Qt6-based SDK to develop \
+applications for Matrix.
+libQuotient is a library that enables client applications.
+It is the backbone of Quaternion, NeoChat and other projects.
+Versions 0.5.x and older use the previous name - libQMatrixClient."
+HOMEPAGE="https://github.com/quotient-im/libQuotient"
+COPYRIGHT="Quotient contributors"
+LICENSE="GNU LGPL v2.1"
+REVISION="1"
+SOURCE_URI="https://github.com/quotient-im/libQuotient/archive/refs/tags/$portVersion.tar.gz"
+CHECKSUM_SHA256="5e607eb978a5daa82e2186cd92f0d964cb820c72cfad95ed2adda4525ed923b5"
+SOURCE_DIR="libQuotient-$portVersion"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%.*}"
+
+PROVIDES="
+	libquotient0.9_qt6$secondaryArchSuffix = $portVersion
+	lib:libQuotientQt6$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libolm$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Keychain$secondaryArchSuffix
+	lib:libQt6Multimedia$secondaryArchSuffix
+	lib:libQt6Network$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libquotient0.9_qt6${secondaryArchSuffix}_devel = $portVersion
+	devel:libQuotientQt6$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	libquotient0.9_qt6$secondaryArchSuffix == $portVersion base
+	devel:libolm$secondaryArchSuffix
+	devel:libQt6Keychain$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libolm$secondaryArchSuffix
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Keychain$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix >= 3
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+defineDebugInfoPackage libquotient0.9_qt6$secondaryArchSuffix \
+	$libDir/libQuotientQt6.so.$libVersion
+
+BUILD()
+{
+	cmake -Bbuild -S. $cmakeDirArgs \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_SHARED_LIBS=ON \
+		-DBUILD_TESTING=OFF
+	make -Cbuild $jobArgs
+}
+
+INSTALL()
+{
+	make -Cbuild install
+
+	# get rid of dataDir with Android.mk
+	rm -rf $dataDir
+
+	prepareInstalledDevelLib \
+		libQuotientQt6
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir \
+		$libDir/cmake
+}
+
+TEST()
+{
+#	88% tests passed, 1 tests failed out of 8
+	ctest --test-dir build --output-on-failure
+}