diff --git a/x11-wm/cage/Makefile b/x11-wm/cage/Makefile
index 5eaa0aba2f46..d4787bf05c0e 100644
--- a/x11-wm/cage/Makefile
+++ b/x11-wm/cage/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	cage
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.4
 PORTREVISION=	4
 CATEGORIES=	x11-wm wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	70ecdcb02ea0.patch:-p1 # https://github.com/Hjdskes/cage/pull/148
-PATCHFILES+=	31a3571a7798.patch:-p1 # https://github.com/Hjdskes/cage/pull/209
-PATCHFILES+=	1a3ab3eb3ad0.patch:-p1 # https://github.com/Hjdskes/cage/pull/198
-PATCHFILES+=	ee748fec3adf.patch:-p1 # https://github.com/Hjdskes/cage/pull/197
+PATCHFILES+=	70ecdcb02ea0.patch:-p1 # https://github.com/cage-kiosk/cage/pull/148
+PATCHFILES+=	31a3571a7798.patch:-p1 # https://github.com/cage-kiosk/cage/pull/209
+PATCHFILES+=	1a3ab3eb3ad0.patch:-p1 # https://github.com/cage-kiosk/cage/pull/198
+PATCHFILES+=	ee748fec3adf.patch:-p1 # https://github.com/cage-kiosk/cage/pull/197
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Wayland kiosk
 WWW=		https://www.hjdskes.nl/projects/cage/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
 		wlroots>=0.15.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	pixman
-GH_ACCOUNT=	Hjdskes
+GH_ACCOUNT=	cage-kiosk
 PLIST_FILES=	bin/${PORTNAME}
 
 OPTIONS_DEFINE=	MANPAGES X11
 OPTIONS_DEFAULT=MANPAGES X11
 
 MANPAGES_BUILD_DEPENDS=	scdoc>=1.9.2:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz
 
 X11_MESON_TRUE=	xwayland
 
 post-patch:
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
 
 .include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/cage/distinfo b/x11-wm/cage/distinfo
index 4cf877a2040e..a49b5782bd48 100644
--- a/x11-wm/cage/distinfo
+++ b/x11-wm/cage/distinfo
@@ -1,11 +1,11 @@
 TIMESTAMP = 1624693180
-SHA256 (Hjdskes-cage-v0.1.4_GH0.tar.gz) = dfe27fb0c7d43db72d6c82f01e2736580a0791a23ba69d7b56285d08af98ad90
-SIZE (Hjdskes-cage-v0.1.4_GH0.tar.gz) = 25430
+SHA256 (cage-kiosk-cage-v0.1.4_GH0.tar.gz) = dfe27fb0c7d43db72d6c82f01e2736580a0791a23ba69d7b56285d08af98ad90
+SIZE (cage-kiosk-cage-v0.1.4_GH0.tar.gz) = 25430
 SHA256 (70ecdcb02ea0.patch) = 2dd0e99d181986c6b2d5e04e89f692e3d77b8bd2a3a08f94cf8a27b38489eb3c
 SIZE (70ecdcb02ea0.patch) = 2137
 SHA256 (31a3571a7798.patch) = 2bedfc37fd7ef5e623e1ba4202be8c2fe2837a495d716c05ae19c41f561f69aa
 SIZE (31a3571a7798.patch) = 880
 SHA256 (1a3ab3eb3ad0.patch) = 7a652a0bb0cfc54da5f4687c55c5576b7413615b171582871c22a6217fc75013
 SIZE (1a3ab3eb3ad0.patch) = 1417
 SHA256 (ee748fec3adf.patch) = 641d86dfac45f471b953b3bfd1884944a1e3292d5d8327bbdbc588e71f9969a6
 SIZE (ee748fec3adf.patch) = 10111