diff --git a/media-libs/wivrn/Manifest b/media-libs/wivrn/Manifest
index 0843994109..996fdd9117 100644
--- a/media-libs/wivrn/Manifest
+++ b/media-libs/wivrn/Manifest
@@ -1,6 +1,6 @@
-DIST wivrn-0.25-server-build-deps.tar.xz 22247744 BLAKE2B d11282538d68a9f4d4eb1abc473fe8e95294beada00eb4434ca7c97fb7931fd18f2cee75f09bb02bf58b77757873ea237c413bebfe4bca88b9d59bfa40683c66 SHA512 dd41b236784a7a5ec6fb8afdcf6b727f6f6c210be0b5d23ff82bb81315b3a8bda2c6d22ff5b5f12990b1bf11826ac0da5f96f0f4138ac170762a57ef2ee03da8
-DIST wivrn-0.25.tar.gz 11322202 BLAKE2B 9409ef567fd6ae973313c5164d4dd043a65c7171d066105a81a19cb856104c28890a083ff4cb028f7debe05841097ea624ed93c866db35c093036cfe22d46e45 SHA512 c5904b9b0888d9795b1f26836c7047daa4ec43ec0729d11549b5b996976dce9818f2e28030d9a21584aedb989bb5817dbbbb54aa41e4c4d4d1778a851032b1bc
 DIST wivrn-25.6.1-server-build-deps.tar.xz 22193276 BLAKE2B 0767414c83f04f6e32d0491d5163f8a37b713363e4f16695ad7aa2fd2a62a722a245b0a6827eec2653331450d69bad738515f4285ea3e8b3e8097bbc2acf897d SHA512 eb212ff9d08e1ee196606be66885b5af78650cc2b4d06fbaeac9a60f94417b3389bbe75cdde09a7c7fe47327a56ca63cae61e9737a014f22ee8e527f6c9979f4
 DIST wivrn-25.6.1.tar.gz 11323454 BLAKE2B 9c2130656c76bf5b01be9f373d490fd595bba83debd15066360ef41e094ad16733b1d160ce239288e19c0d103800ff1d138b2a46eba9115d1d6db903064dcab3 SHA512 ad37cc2f9eeb4801bd310dee11ed68348e812bbe5f47903789ab8bf7860e779a8d35bcb1ef6f4c5738fc74c4983fe0078cec0a54966b2da52703f23b6785f783
 DIST wivrn-25.8-server-build-deps.tar.xz 22876608 BLAKE2B e54f1da83bd9cc1a470893748663c63523ec283b4f3c69eec5aaf7dbe382118923198a70e6caa4abddc4ffbe4c538347c9483e3af154031950273f1d00920f3d SHA512 a702ec6850c392fa6353522ff27edb12fcb9017424cbf9560a64e47f9b1dd22878b4f4ffb96eb14a1b0a8de4f24801caf94aaaf592f1b095d63269db8ad8b2d0
 DIST wivrn-25.8.tar.gz 11441756 BLAKE2B 1cb44f774afc744e279e23561c4b4deddaaf18e63e1c119703f9a1eb1a9b63cb36225bbbe3b73f6bc2ac4c21cf0c03928da81ea7e6b6b3217958549ca920d8f5 SHA512 be6f260e2ccbcc276f4656a2d3a7797384d4cd293a4bd9bb9aa035eaf2e059fd2c4d9d896f9841b904cf3cf3a27ea36b8a01c7f400a20fd0a0332db0c51c53e9
+DIST wivrn-25.9-server-build-deps.tar.xz 22610092 BLAKE2B 7ae693051d1f64cec25357aedb77e9501af071d47e06774f80aee7b55b3c834f379ddbd4a9fdc5a8795b9a84ac0bc1708e14e8f65f4f54485e0b02a6ceb3641f SHA512 d044cd604c5d21955baff45e8dd86293721d36c53eb6d94a05a2c68e65ac7e17b862153694d504f708cb80d42d226d3146aa2a56f376b8a7b1dba42f0be99fcb
+DIST wivrn-25.9.tar.gz 11444064 BLAKE2B a7d816eb12c8f2da8932c5e06b8c53b741386a7c2ccaad11608dff10fc9c1b280f6970c172bf26b9a5cc61fb967f7257d98679acef5948d4116e60677879d39c SHA512 67db629b44cc001e25650ffe9a5cd2045d96f92471219f3dd44a9efe280c9c13a38a5d065f1f3a9e3895186d364cd3cd6e94728352a9d0beb5a01e26e355bedb
diff --git a/media-libs/wivrn/wivrn-0.25.ebuild b/media-libs/wivrn/wivrn-25.9.ebuild
similarity index 67%
rename from media-libs/wivrn/wivrn-0.25.ebuild
rename to media-libs/wivrn/wivrn-25.9.ebuild
index 058c7e1e36..8b7bc3721b 100644
--- a/media-libs/wivrn/wivrn-0.25.ebuild
+++ b/media-libs/wivrn/wivrn-25.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake fcaps flag-o-matic xdg
+inherit cmake-multilib fcaps flag-o-matic xdg
 
 DESCRIPTION="WiVRn OpenXR streaming"
 HOMEPAGE="https://github.com/WiVRn/WiVRn"
@@ -16,6 +16,7 @@ REQUIRED_USE="|| ( nvenc vaapi x264 )"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WiVRn/WiVRn.git"
+	EGIT_MIN_CLONE_TYPE="single+tags"
 	MONADO_REPO_URI="https://gitlab.freedesktop.org/monado/monado.git"
 else
 	SRC_URI="
@@ -25,9 +26,12 @@ else
 fi
 
 RDEPEND="
+	app-arch/libarchive
 	dev-libs/glib
 	dev-libs/libbsd
 	dev-libs/openssl
+	gnome-base/librsvg
+	media-libs/libpng
 	media-libs/openxr-loader
 	net-dns/avahi
 	x11-libs/libnotify
@@ -65,17 +69,14 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	dev-cpp/cli11
-	dev-cpp/eigen
-	dev-cpp/nlohmann_json
 	dev-libs/boost
 "
 BDEPEND="
+	dev-cpp/cli11
+	dev-cpp/eigen
+	dev-cpp/nlohmann_json
 	dev-util/glslang
 	dev-util/gdbus-codegen
-	gui? (
-		gnome-base/librsvg
-	)
 	dev-util/vulkan-headers
 "
 
@@ -84,7 +85,13 @@ if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
 		default_src_unpack
 
-		local MONADO_COMMIT=$(grep "GIT_TAG" "${P}/CMakeLists.txt" | awk '{print $2}' | tail -1)
+		# export those before Monado is checked out
+		export GIT_DESC=$(git -C "${EGIT_DIR}" describe "${EGIT_VERSION}" --tags --always)
+		export GIT_COMMIT=${EGIT_VERSION}
+
+		# Only use those for the main repo
+		unset EGIT_BRANCH EGIT_COMMIT
+		local MONADO_COMMIT=$(cat "${P}/monado-rev")
 		git-r3_fetch "${MONADO_REPO_URI}" "${MONADO_COMMIT}"
 		git-r3_checkout "${MONADO_REPO_URI}" "${WORKDIR}/monado-src"
 	}
@@ -102,13 +109,10 @@ else
 	}
 fi
 
-src_configure() {
+multilib_src_configure() {
 	use debug || append-cflags "-DNDEBUG"
 	use debug || append-cxxflags "-DNDEBUG"
-	if [[ ${PV} == 9999 ]]; then
-		GIT_DESC=$(git describe --tags --always)
-		GIT_COMMIT=$(git rev-parse HEAD)
-	else
+	if [[ ${PV} != 9999 ]]; then
 		GIT_DESC=v${PV}
 		GIT_COMMIT=v${PV}
 	fi
@@ -116,19 +120,20 @@ src_configure() {
 		-DGIT_DESC=${GIT_DESC}
 		-DGIT_COMMIT=${GIT_COMMIT}
 		-DWIVRN_BUILD_CLIENT=OFF
-		-DWIVRN_BUILD_SERVER=ON
-		-DWIVRN_OPENXR_MANIFEST_TYPE=relative
-		-DWIVRN_BUILD_DASHBOARD=$(usex gui)
-		-DWIVRN_BUILD_DISSECTOR=$(usex wireshark-plugins)
-		-DWIVRN_BUILD_WIVRNCTL=ON
+		-DWIVRN_BUILD_SERVER=$(multilib_is_native_abi && echo ON || echo OFF)
+		-DWIVRN_BUILD_SERVER_LIBRARY=ON
+		-DWIVRN_OPENXR_MANIFEST_TYPE=filename
+		-DWIVRN_BUILD_DASHBOARD=$(multilib_native_usex gui)
+		-DWIVRN_BUILD_DISSECTOR=$(multilib_native_usex wireshark-plugins)
+		-DWIVRN_BUILD_WIVRNCTL=$(multilib_is_native_abi && echo ON || echo OFF)
 		-DWIVRN_FEATURE_STEAMVR_LIGHTHOUSE=ON
-		-DWIVRN_USE_PIPEWIRE=$(usex pipewire)
-		-DWIVRN_USE_PULSEAUDIO=$(usex pulseaudio)
-		-DWIVRN_USE_NVENC=$(usex nvenc)
-		-DWIVRN_USE_VAAPI=$(usex vaapi)
+		-DWIVRN_USE_PIPEWIRE=$(multilib_native_usex pipewire)
+		-DWIVRN_USE_PULSEAUDIO=$(multilib_native_usex pulseaudio)
+		-DWIVRN_USE_NVENC=$(multilib_native_usex nvenc)
+		-DWIVRN_USE_VAAPI=$(multilib_native_usex vaapi)
 		-DWIVRN_USE_VULKAN_ENCODE=ON
-		-DWIVRN_USE_X264=$(usex x264)
-		-DWIVRN_USE_SYSTEMD=$(usex systemd)
+		-DWIVRN_USE_X264=$(multilib_native_usex x264)
+		-DWIVRN_USE_SYSTEMD=$(multilib_native_usex systemd)
 		-DWIVRN_USE_SYSTEM_OPENXR=ON
 		-DWIVRN_USE_SYSTEM_BOOST=ON
 		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
@@ -139,6 +144,19 @@ src_configure() {
 	cmake_src_configure
 }
 
+multilib_src_install() {
+	cmake_src_install
+
+	local i ldpath=""
+	for i in $(get_all_libdirs) ; do
+		ldpath="${ldpath}:/usr/${i}/wivrn"
+	done
+	newenvd - "50${PN}" <<-_EOF_
+		LDPATH="${ldpath}"
+		PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES=1
+	_EOF_
+ }
+
 pkg_postinst()
 {
 	fcaps cap_sys_nice usr/bin/wivrn-server