diff --git a/media-libs/wivrn/Manifest b/media-libs/wivrn/Manifest
index c3c01392ee..9eba3114a0 100644
--- a/media-libs/wivrn/Manifest
+++ b/media-libs/wivrn/Manifest
@@ -1,2 +1,4 @@
 DIST wivrn-26.6.2-server-build-deps.tar.xz 25965996 BLAKE2B 882d6c5357b8ae30ae86554c6ddc01db2edba9ad152c7d9e2924e084285609942c8f9a216e3edfdba9b15d44aec3b95fda5dded8171faee1242c966b301be96a SHA512 803c6c1aab4fcb47708b01471629b84400ce71b70c8cf4f7439edaad61f9aa45c695c7763836fb845619182279432b622d09328441533dbe5c8a4f4bcff5674b
 DIST wivrn-26.6.2.tar.gz 4104326 BLAKE2B 724e312244b277b232ffdffcff6596b903782b794804e55353ca04c8720eb847dc8196b90bf249bf7df999e53051e7767ff662d08277bda7b44c0dd1492eb70c SHA512 ce210881d43a09a4fc8a6c6fe6e40b6925a110d715a3f15ad38d5210b9ef06361e62ee6e267ffcb8fbc0f50ff9a71254c6bcd3a3e13c7bff2b09eb2532fc0db8
+DIST wivrn-26.9-server-build-deps.tar.xz 4256496 BLAKE2B 1b470f490da47e094c93f83890a39a04b25fc83522e6dd56273c11d9958ceefa06234ff62126459b7d458b2345dc9b250d02d963fbe2efede9c8427eaa9f2750 SHA512 096daf43cb0849a986802ead071ddc0a7a25f277006ca44ef947a991e25d0eb473d3e4e2db2db0d79e485849e5dbc06eaf3af45a00affa7868ebbb7d3d642365
+DIST wivrn-26.9.tar.gz 4119144 BLAKE2B 57b539051feb3c1b571efb993b7563b3a88c49da29a9a18eb0164d9881c205096c7514ed1fb7ea08f2c7fc23c0e782688e6aa970250bc06217d8d7500ad522a8 SHA512 4a550ccc698a2c8926d5d71b91551df1bb00976540b3920e90b52231d615559d4adef882afb22ded7a6789bdd71e3a52a299b0d1cee5f56a7c9bf811c41f8d47
diff --git a/media-libs/wivrn/wivrn-26.9.ebuild b/media-libs/wivrn/wivrn-26.9.ebuild
new file mode 100644
index 0000000000..2244242ba2
--- /dev/null
+++ b/media-libs/wivrn/wivrn-26.9.ebuild
@@ -0,0 +1,167 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic xdg
+
+DESCRIPTION="WiVRn OpenXR streaming"
+HOMEPAGE="https://github.com/WiVRn/WiVRn"
+
+LICENSE="GPL-3 Apache-2.0 MIT"
+SLOT="0"
+IUSE="debug gui nvenc +pipewire pulseaudio vaapi wireshark-plugins x264"
+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="
+		https://github.com/WiVRn/WiVRn/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/WiVRn/WiVRn/releases/download/v${PV}/server-build-deps.tar.xz -> ${P}-server-build-deps.tar.xz"
+	KEYWORDS="~amd64"
+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
+	|| (
+		sys-apps/systemd
+		sys-auth/elogind
+	)
+	gui? (
+		dev-libs/kirigami-addons
+		dev-libs/qcoro[qml]
+		kde-frameworks/kcoreaddons:6
+		kde-frameworks/ki18n:6
+		kde-frameworks/kiconthemes:6
+		kde-frameworks/kirigami:6
+		kde-frameworks/qqc2-desktop-style:6
+	)
+	pipewire? (
+		media-video/pipewire
+	)
+	pulseaudio? (
+		media-libs/libpulse
+	)
+	vaapi? (
+		media-video/ffmpeg[drm(-),vaapi]
+	)
+	x264? (
+		media-libs/x264
+	)
+	wireshark-plugins? (
+		!=net-analyzer/wireshark-4.6.0
+		net-analyzer/wireshark
+	)
+"
+DEPEND="
+	${RDEPEND}
+
+	dev-libs/boost
+	dev-cpp/cli11
+	dev-cpp/eigen
+	dev-cpp/nlohmann_json
+	dev-util/vulkan-headers
+"
+BDEPEND="
+	dev-util/glslang
+	dev-util/gdbus-codegen
+"
+
+if [[ ${PV} == 9999 ]]; then
+	src_unpack() {
+		git-r3_src_unpack
+		default_src_unpack
+
+		# 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"
+	}
+
+	src_prepare() {
+		default_src_prepare
+		eapply --directory="${WORKDIR}/monado-src" "${WORKDIR}/${P}/patches/monado"/*
+		cmake_src_prepare
+	}
+else
+	src_unpack() {
+		default_src_unpack
+		cd "${WORKDIR}"
+		mv "WiVRn-${PV}" "${P}"
+	}
+fi
+
+multilib_src_configure() {
+	use debug || append-cflags "-DNDEBUG"
+	use debug || append-cxxflags "-DNDEBUG"
+	if [[ ${PV} != 9999 ]]; then
+		GIT_TAG=v${PV}
+		GIT_DESC=""
+		GIT_COMMIT=""
+	else
+		GIT_TAG=""
+	fi
+	local mycmakeargs=(
+		-DGIT_TAG=${GIT_TAG}
+		-DGIT_DESC=${GIT_DESC}
+		-DGIT_COMMIT=${GIT_COMMIT}
+		-DWIVRN_BUILD_CLIENT=OFF
+		-DWIVRN_BUILD_SERVER=$(multilib_is_native_abi && echo ON || echo OFF)
+		-DWIVRN_BUILD_SERVER_LIBRARY=ON
+		-DWIVRN_OPENXR_MANIFEST_TYPE=relative
+		-DWIVRN_OPENXR_MANIFEST_ABI=$(multilib_is_native_abi && echo OFF || echo ON)
+		-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=$(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=$(multilib_native_usex x264)
+		-DWIVRN_USE_SYSTEM_OPENXR=ON
+		-DWIVRN_USE_SYSTEM_BOOST=ON
+		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
+		-DFETCHCONTENT_BASE_DIR="${WORKDIR}"
+		-DENABLE_COLOURED_OUTPUT=OFF
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	newenvd - "50${PN}" <<-_EOF_
+PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES=1
+	_EOF_
+}
+
+pkg_postinst()
+{
+	xdg_pkg_postinst
+	elog "WiVRn requires a compatible client on VR headset to run."
+	if [[ ${PV} == 9999 ]]; then
+		elog "For most headsets it can be downloaded from CI artifacts on https://github.com/WiVRn/WiVRn/actions/workflows/Build.yml"
+	else
+		elog "For most headsets it can be downloaded on https://github.com/WiVRn/WiVRn/releases/tag/v${PV}"
+	fi
+}