diff --git a/media-libs/openxr-loader/Manifest b/media-libs/openxr-loader/Manifest
index 25e6cff8ee..0aa0b6a299 100644
--- a/media-libs/openxr-loader/Manifest
+++ b/media-libs/openxr-loader/Manifest
@@ -1 +1 @@
-DIST openxr-loader-1.0.31.tar.gz 572848 BLAKE2B 60483a5f1dd90dade7dbcfe08e0b165066ba5a880fb7b661676fbd6d2bbbb1e3a2d619d26bbc55e1339652e237abe53081806c97ab373c36c1420e6f3642ffcf SHA512 6efc7596e707f95366dbcdbac9bd7d0c20735a2175b4edf56a9e8a112cf0ab8b664069fe942313164a37119032ddbf5671bc88ab5f276005dd36e4a4dabba1c7
+DIST openxr-loader-1.1.40.tar.gz 620341 BLAKE2B 75e0108c803501e3d34b7e494e08ddeffc64d311bfe28e271d23d1b9a621f86f6e296707a59edddf7ec6d0312c81cfce45a512d1c8d99448543878794298003e SHA512 1012dbb152a1b6343eb39c460d68daae87cff42ffaf15b9c4d7efc8abea77ecff45d593bdedb9767c772890022c45374b04e1167296f01c6507fd987a4c25fc2
diff --git a/media-libs/openxr-loader/openxr-loader-1.0.31.ebuild b/media-libs/openxr-loader/openxr-loader-1.1.40.ebuild
similarity index 70%
rename from media-libs/openxr-loader/openxr-loader-1.0.31.ebuild
rename to media-libs/openxr-loader/openxr-loader-1.1.40.ebuild
index 0fc7f81d5d..0a7f9f4190 100644
--- a/media-libs/openxr-loader/openxr-loader-1.0.31.ebuild
+++ b/media-libs/openxr-loader/openxr-loader-1.1.40.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
 	SLOT="0"
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/${MY_PN}-release-${PV}"
 	SLOT="0/${PV}"
@@ -23,6 +23,7 @@ HOMEPAGE="https://github.com/KhronosGroup/OpenXR-SDK"
 LICENSE="Apache-2.0"
 
 IUSE="+wayland +X"
+REQUIRED_USE="|| ( wayland X )"
 
 DEPEND="
 	media-libs/vulkan-loader
@@ -31,7 +32,6 @@ DEPEND="
 	wayland? (
 		dev-libs/wayland
 		dev-libs/wayland-protocols
-		dev-util/wayland-scanner
 	)
 	X? (
 		x11-libs/libxcb
@@ -40,6 +40,14 @@ DEPEND="
 		x11-libs/libXxf86vm
 	)
 "
+RDEPEND="${DEPEND}"
+BDEPEND="wayland? ( dev-util/wayland-scanner )"
+
+src_prepare() {
+	sed -i 's;DESTINATION share/doc/openxr;DESTINATION ${CMAKE_INSTALL_DOCDIR};' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(
@@ -47,6 +55,7 @@ src_configure() {
 		-DBUILD_WITH_XLIB_HEADERS=$(usex X)
 		-DBUILD_WITH_XCB_HEADERS=$(usex X)
 		-DBUILD_WITH_WAYLAND_HEADERS=$(usex wayland)
+		-DPRESENTATION_BACKEND=$(usex X xlib wayland)
 	)
 
 	cmake_src_configure
diff --git a/media-libs/openxr-loader/openxr-loader-9999.ebuild b/media-libs/openxr-loader/openxr-loader-9999.ebuild
index 0fc7f81d5d..0a7f9f4190 100644
--- a/media-libs/openxr-loader/openxr-loader-9999.ebuild
+++ b/media-libs/openxr-loader/openxr-loader-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
 	SLOT="0"
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/${MY_PN}-release-${PV}"
 	SLOT="0/${PV}"
@@ -23,6 +23,7 @@ HOMEPAGE="https://github.com/KhronosGroup/OpenXR-SDK"
 LICENSE="Apache-2.0"
 
 IUSE="+wayland +X"
+REQUIRED_USE="|| ( wayland X )"
 
 DEPEND="
 	media-libs/vulkan-loader
@@ -31,7 +32,6 @@ DEPEND="
 	wayland? (
 		dev-libs/wayland
 		dev-libs/wayland-protocols
-		dev-util/wayland-scanner
 	)
 	X? (
 		x11-libs/libxcb
@@ -40,6 +40,14 @@ DEPEND="
 		x11-libs/libXxf86vm
 	)
 "
+RDEPEND="${DEPEND}"
+BDEPEND="wayland? ( dev-util/wayland-scanner )"
+
+src_prepare() {
+	sed -i 's;DESTINATION share/doc/openxr;DESTINATION ${CMAKE_INSTALL_DOCDIR};' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(
@@ -47,6 +55,7 @@ src_configure() {
 		-DBUILD_WITH_XLIB_HEADERS=$(usex X)
 		-DBUILD_WITH_XCB_HEADERS=$(usex X)
 		-DBUILD_WITH_WAYLAND_HEADERS=$(usex wayland)
+		-DPRESENTATION_BACKEND=$(usex X xlib wayland)
 	)
 
 	cmake_src_configure