diff --git a/media-libs/wivrn/Manifest b/media-libs/wivrn/Manifest
index 0af943d454..75d90c0ec7 100644
--- a/media-libs/wivrn/Manifest
+++ b/media-libs/wivrn/Manifest
@@ -1,4 +1,6 @@
 DIST wivrn-0.22-server-build-deps.tar.xz 21634036 BLAKE2B 1b6ddb85617f02c683d3da1908e4afa92ca620ebace42c6030ece9cabde1311d4262bcd02a66166bf19a247b149f9bdeec3cfa21abbbb0a5cbadb0c97f0e0317 SHA512 98b99adb3b00fca1a1650f0cd082cb363da66c3245976a51ede6fa7117f52c1fec3269644d6917111897e3e2c972a6b9ea12c78882fed49bafec9ad83e6e512f
 DIST wivrn-0.22.tar.gz 11159586 BLAKE2B e83b3d95ad92c752e39d5233c2636f5cf095183880fa12a08589afa1e645a5ea7b41cdb985c5f43107c03c0c1aa3b13718cc4f9ddf7da9f4f7d1159a9057bfe0 SHA512 24fc6f36e4c9345a9f3fc3e6c2c47fbee5cdbc2f9864e58e5750209f58e32c40e08d48d091d7b2d5a2d161c4017642e3747799d8efc3e7bc5d6d040191022536
 DIST wivrn-0.23-server-build-deps.tar.xz 21726340 BLAKE2B 74fe5f67c6e5e4e068799a891af78c259227cae67ac89676653c01bb8386fda3be0e305095977e8c452741881309b09b9b454991f123625efae6ef1de338afe7 SHA512 c6101e75f001fbafd62928be73238c17fd10f18f3c78893ec0c5a342dbb98979605818bfe6fc10c03ec657ceb4742e5763b07003a6d7d8bcd8736a34c07f84d7
+DIST wivrn-0.23.1-server-build-deps.tar.xz 21997660 BLAKE2B 2d1d2d00e8a0d744d7aba4bccaf425ec8cbbcc4ce549133cb6f90dec73a98ef747acc53c250c44cbf829b0d0b4ed8a52fded60adc216195b0139f1ca5e6a451e SHA512 85fd974e2fb19643ac54c980c0a3521fea0f4422f6caa36643d08fe8466dceb6fe57e3acf191c72e611ee297cfa18ff821406de3765c9a7c28e836c393b97722
+DIST wivrn-0.23.1.tar.gz 11182748 BLAKE2B bd13efc9d7a2a5ed78de9e2486d700c281eca8ef7d1c0d3ba6235b9b9dd055d5446124b618c43db23fd6e552012dd02f47135e1b615d15f424fceb508f3f441e SHA512 0492576c48ae645a601f85995a9f1c78eb3128c200e054bd1000b32a10744131b3209fd379d2fe0fa8882dacf2e056b910526fd3dc5dd1ca88cfaf7139422f8b
 DIST wivrn-0.23.tar.gz 11176178 BLAKE2B 49515a1149ed2412caf2b83867873a47cf440e072f3f7fd8bde66f2fa358f9bdaa6f7e18e723e2d99fc3e26d696c7edfed8279e853b71ac7b66f16a362b267a5 SHA512 93110ce936a3e210ac3093cbee043c087b3241d921f900c62dd9003cbdeff9c5399f322d2f87b6144aacd34c7f1ad3ea9d67e2565a7cd08ad20b1e9a62cda61d
diff --git a/media-libs/wivrn/wivrn-0.23.1.ebuild b/media-libs/wivrn/wivrn-0.23.1.ebuild
new file mode 100644
index 0000000000..8810055098
--- /dev/null
+++ b/media-libs/wivrn/wivrn-0.23.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake fcaps xdg
+
+DESCRIPTION="WiVRn OpenXR streaming"
+HOMEPAGE="https://github.com/WiVRn/WiVRn"
+
+LICENSE="GPL-3 Apache-2.0 MIT"
+SLOT="0"
+IUSE="gui nvenc +pipewire pulseaudio systemd 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"
+	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="
+	dev-libs/glib
+	dev-libs/libbsd
+	dev-libs/openssl
+	media-libs/openxr-loader
+	net-dns/avahi
+	x11-libs/libnotify
+	|| (
+		sys-apps/systemd
+		sys-auth/elogind
+	)
+	gui? (
+		dev-libs/qcoro
+		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
+	)
+	systemd? (
+		sys-apps/systemd
+	)
+	vaapi? (
+		media-video/ffmpeg[libdrm,vaapi]
+	)
+	wireshark-plugins? (
+		net-analyzer/wireshark
+	)
+	x264? (
+		media-libs/x264
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/cli11
+	dev-cpp/eigen
+	dev-cpp/nlohmann_json
+	dev-libs/boost
+"
+BDEPEND="
+	dev-util/glslang
+	dev-util/gdbus-codegen
+	gui? (
+		gnome-base/librsvg
+	)
+	dev-util/vulkan-headers
+"
+
+if [[ ${PV} == 9999 ]]; then
+	src_unpack() {
+		git-r3_src_unpack
+		default_src_unpack
+
+		local MONADO_COMMIT=$(grep "GIT_TAG" "${P}/CMakeLists.txt" | awk '{print $2}' | tail -1)
+		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
+
+src_configure() {
+	if [[ ${PV} == 9999 ]]; then
+		GIT_DESC=$(git describe --tags --always)
+		GIT_COMMIT=$(git rev-parse HEAD)
+	else
+		GIT_DESC=v${PV}
+		GIT_COMMIT=v${PV}
+	fi
+	local mycmakeargs=(
+		-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_USE_PIPEWIRE=$(usex pipewire)
+		-DWIVRN_USE_PULSEAUDIO=$(usex pulseaudio)
+		-DWIVRN_USE_NVENC=$(usex nvenc)
+		-DWIVRN_USE_VAAPI=$(usex vaapi)
+		-DWIVRN_USE_VULKAN_ENCODE=ON
+		-DWIVRN_USE_X264=$(usex x264)
+		-DWIVRN_USE_SYSTEMD=$(usex systemd)
+		-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
+}
+
+src_install() {
+	cmake_src_install
+
+	dosym -r /usr/share/openxr/1/openxr_wivrn.json /etc/openxr/1/active_runtime.json
+}
+
+pkg_postinst()
+{
+	fcaps cap_sys_nice bin/wivrn-server
+	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
+}