diff --git a/app-crypt/olm/olm-3.2.7.recipe b/dev-libs/olm/olm-3.2.16.recipe
similarity index 78%
rename from app-crypt/olm/olm-3.2.7.recipe
rename to dev-libs/olm/olm-3.2.16.recipe
index b4c0d9957..35f8d47d0 100644
--- a/app-crypt/olm/olm-3.2.7.recipe
+++ b/dev-libs/olm/olm-3.2.16.recipe
@@ -7,14 +7,15 @@ HOMEPAGE="https://gitlab.matrix.org/matrix-org/olm"
 COPYRIGHT="2015-2016 OpenMarket Ltd.
 	2018-2019 New Vector Ltd."
 LICENSE="Apache v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://gitlab.matrix.org/matrix-org/olm/-/archive/$portVersion/olm-$portVersion.tar.bz2"
-CHECKSUM_SHA256="b16e776f1b751744ab4942a5e2e5db418f5c912f7c429fae37d8444c7191a1f7"
+CHECKSUM_SHA256="327cfcb81ef0c42f4b1d5c24b25d56932b57d64ccd9f00ed919a893a43333411"
+PATCHES="olm-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
-libVersion="3.2.7"
+libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
@@ -47,23 +48,16 @@ defineDebugInfoPackage olm$secondaryArchSuffix \
 
 BUILD()
 {
-	mkdir -p haiku_build && cd "$_"
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		$cmakeDirArgs \
+		-DOLM_TESTS=OFF
 
-	# Test fals to build, complains about fPIC
-	cmake .. \
-		-DOLM_TESTS=OFF \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		$cmakeDirArgs
-
-	make $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd haiku_build
-	make install
-
-	rm -f "$libDir"/libolm.la
+	make -C build install
 
 	prepareInstalledDevelLib libolm
 	fixPkgconfig
@@ -75,5 +69,5 @@ INSTALL()
 
 TEST()
 {
-	make test
+	ctest --test-dir build/tests --output-on-failure
 }
diff --git a/dev-libs/olm/patches/olm-3.2.16.patchset b/dev-libs/olm/patches/olm-3.2.16.patchset
new file mode 100644
index 000000000..81ca1bc0a
--- /dev/null
+++ b/dev-libs/olm/patches/olm-3.2.16.patchset
@@ -0,0 +1,22 @@
+From 44da8be918b31762001a6c8bc7a3fc2a6b04c9d7 Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+Date: Fri, 20 Dec 2024 08:23:58 +0100
+Subject: Turn off CMAKE_POSITION_INDEPENDENT_CODE
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 951965f..b8cd972 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_C_STANDARD 99)
+ set(CMAKE_C_STANDARD_REQUIRED ON)
+-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
++set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
+ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+ 
+ if(NOT CMAKE_BUILD_TYPE)
+-- 
+2.45.2
+