diff --git a/dev-libs/libmatrix_client/libmatrix_client-0.4.1.recipe b/dev-libs/mtxclient/mtxclient-0.4.1.recipe
similarity index 60%
rename from dev-libs/libmatrix_client/libmatrix_client-0.4.1.recipe
rename to dev-libs/mtxclient/mtxclient-0.4.1.recipe
index bafc89262..5925d76c0 100644
--- a/dev-libs/libmatrix_client/libmatrix_client-0.4.1.recipe
+++ b/dev-libs/mtxclient/mtxclient-0.4.1.recipe
@@ -3,10 +3,10 @@ DESCRIPTION="mtxclient is a C++ library implementing the Matrix protocol"
 HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient"
 COPYRIGHT="2018 Konstantinos Sideris"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/Nheko-Reborn/mtxclient/archive/v$portVersion.tar.gz"
-SOURCE_DIR="mtxclient-$portVersion"
 CHECKSUM_SHA256="edd2ac051cf8019579942107fd32ec67dbf3581829954b5cca07e74431b9770a"
+SOURCE_FILENAME="mtxclient-v$portVersion.tar.gz"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -14,44 +14,53 @@ SECONDARY_ARCHITECTURES="x86"
 libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
+boostMinimumVersion="1.70.0"
+
 PROVIDES="
-	libmatrix_client$secondaryArchSuffix = $portVersion
+	mtxclient$secondaryArchSuffix = $portVersion
 	lib:libmatrix_client$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	boost170$secondaryArchSuffix
 	nlohmann_json
+	lib:libboost_iostreams$secondaryArchSuffix
+	lib:libboost_system$secondaryArchSuffix
+	lib:libboost_thread$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libolm$secondaryArchSuffix 
 	"
 
 PROVIDES_devel="
-	libmatrix_client${secondaryArchSuffix}_devel = $portVersion
+	mtxclient${secondaryArchSuffix}_devel = $portVersion
 	devel:libmatrix_client$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	libmatrix_client$secondaryArchSuffix == $portVersion base
+	mtxclient$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	boost170_devel$secondaryArchSuffix
 	nlohmann_json
+	devel:libboost_iostreams$secondaryArchSuffix >= $boostMinimumVersion
+	devel:libboost_system$secondaryArchSuffix >= $boostMinimumVersion
+	devel:libboost_thread$secondaryArchSuffix >= $boostMinimumVersion
 	devel:libssl$secondaryArchSuffix
 	devel:libolm$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
-	cmd:cmake
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
 BUILD()
 {
-	cmake $cmakeDirArgs -S. -DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF
+	cmake $cmakeDirArgs -S. \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_LIB_TESTS=OFF \
+		-DBUILD_LIB_EXAMPLES=OFF
 	make $jobArgs
 }
 
@@ -62,7 +71,12 @@ INSTALL()
 	prepareInstalledDevelLib libmatrix_client
 	fixPkgconfig
 
+	#fixCmake
+	sed -i 's,\/include,/'${relativeIncludeDir}',g' \
+		$libDir/cmake/MatrixClient/MatrixClientTargets.cmake
+
 	# devel package
 	packageEntries devel \
-		"$developDir"
+		"$developDir" \
+		"$libDir"/cmake
 }