diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile
index 4b07ff95c34b..73b339e7fa66 100644
--- a/x11-wm/gamescope/Makefile
+++ b/x11-wm/gamescope/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	gamescope
 DISTVERSION=	3.11.51
 PORTREVISION=	2
-CATEGORIES=	x11-wm # wayland: depends on https://github.com/Plagman/gamescope/issues/543
+CATEGORIES=	x11-wm # wayland: depends on https://github.com/ValveSoftware/gamescope/issues/543
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	2a84a44f6897.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
-PATCHFILES+=	e0927f7bce95.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
-PATCHFILES+=	a618ea074660.patch:-p1 # https://github.com/Plagman/gamescope/issues/120
+PATCHFILES+=	2a84a44f6897.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/119
+PATCHFILES+=	e0927f7bce95.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/119
+PATCHFILES+=	a618ea074660.patch:-p1 # https://github.com/ValveSoftware/gamescope/issues/120
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Micro-compositor from SteamOS
-WWW=		https://github.com/Plagman/gamescope
+WWW=		https://github.com/ValveSoftware/gamescope
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 		evdev-proto>0:devel/evdev-proto \
 		libliftoff>=0.4.0<0.5.0:graphics/libliftoff \
 		vulkan-headers>0:graphics/vulkan-headers \
 		wayland-protocols>=1.17:graphics/wayland-protocols \
 		hwdata>0:misc/hwdata \
 		wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libdrm.so:graphics/libdrm \
 		libliftoff.so:graphics/libliftoff \
 		libvulkan.so:graphics/vulkan-loader \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	hwdata>0:misc/hwdata
 
 USES=		compiler:c++11-lib meson pkgconfig sdl xorg
 USE_GITHUB=	yes
 USE_SDL=	sdl2
 USE_XORG=	x11 xcomposite xdamage xext xfixes xrender xres xtst xxf86vm
-GH_ACCOUNT=	Plagman
+GH_ACCOUNT=	ValveSoftware
 GH_TUPLE=	nothings:stb:af1a5bc:stb/subprojects/stb \
 		Joshua-Ashton:vkroots:e6b8949:vkroots/subprojects/vkroots
 PLIST_FILES=	bin/${PORTNAME} \
 		lib/libVkLayer_FROG_${PORTNAME}_wsi.so \
 		share/vulkan/implicit_layer.d/VkLayer_FROG_${PORTNAME}_wsi.json
 MESON_ARGS=	--force-fallback-for= # allow system wlroots + libliftoff
 
 OPTIONS_DEFINE=	PIPEWIRE
 OPTIONS_DEFAULT=PIPEWIRE
 
 PIPEWIRE_DESC=		Screen capture via PipeWire
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_MESON_ENABLED=	pipewire
 
 post-extract:
 # Merge patch_directory for subprojects without meson.build
 	@(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..)
 
 .include <bsd.port.mk>
diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo
index 26943899971a..53c74322c005 100644
--- a/x11-wm/gamescope/distinfo
+++ b/x11-wm/gamescope/distinfo
@@ -1,13 +1,13 @@
 TIMESTAMP = 1670438874
-SHA256 (Plagman-gamescope-3.11.51_GH0.tar.gz) = 0ffe1c3e3cdf40e20b45b758f8e4c334c5c0941eb05437e59e9c6aaf8c948a1e
-SIZE (Plagman-gamescope-3.11.51_GH0.tar.gz) = 209920
+SHA256 (ValveSoftware-gamescope-3.11.51_GH0.tar.gz) = 0ffe1c3e3cdf40e20b45b758f8e4c334c5c0941eb05437e59e9c6aaf8c948a1e
+SIZE (ValveSoftware-gamescope-3.11.51_GH0.tar.gz) = 209920
 SHA256 (nothings-stb-af1a5bc_GH0.tar.gz) = 3facf6e6f8c3e1715e1a088f22bad9c9202973f9369fb3f088f46cced3f64058
 SIZE (nothings-stb-af1a5bc_GH0.tar.gz) = 1387334
 SHA256 (Joshua-Ashton-vkroots-e6b8949_GH0.tar.gz) = 2b2e949642d93a9eba7340e7828d38ea0dac822939812020ec63c02e4c4dbc72
 SIZE (Joshua-Ashton-vkroots-e6b8949_GH0.tar.gz) = 272574
 SHA256 (2a84a44f6897.patch) = fd892d4477885926b0ef5793d5222764afa2ba334fd25c4cc671c89812e100b5
 SIZE (2a84a44f6897.patch) = 2931
 SHA256 (e0927f7bce95.patch) = 6bbab2f37d7e76a1eade6d81bc0b441cc09f0020143bafb53555b767bf056600
 SIZE (e0927f7bce95.patch) = 1609
 SHA256 (a618ea074660.patch) = c79b4b7a231d9c6e34912b8f4a301c6c60b921b6be5fb9c132d999e9a6930424
 SIZE (a618ea074660.patch) = 2589
diff --git a/x11-wm/gamescope/files/patch-meson.build b/x11-wm/gamescope/files/patch-meson.build
index 8e50063b56c6..0b813f2ef63b 100644
--- a/x11-wm/gamescope/files/patch-meson.build
+++ b/x11-wm/gamescope/files/patch-meson.build
@@ -1,13 +1,13 @@
-https://github.com/Plagman/gamescope/commit/9600bbaadf9c
+https://github.com/ValveSoftware/gamescope/commit/9600bbaadf9c
 
 --- meson.build.orig	2022-12-07 18:47:54 UTC
 +++ meson.build
 @@ -109,7 +109,7 @@ liftoff_dep = dependency(
  
  liftoff_dep = dependency(
    'libliftoff',
 -  version: ['>= 0.3.0', '< 0.4.0'],
 +  version: ['>= 0.4.0', '< 0.5.0'],
    fallback: ['libliftoff', 'liftoff'],
    default_options: ['default_library=static'],
  )