diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile
index 436d9c8275a5..ebfef7ec1173 100644
--- a/x11-wm/phoc/Makefile
+++ b/x11-wm/phoc/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	phoc
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.1
 PORTREVISION=	2
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
-PATCHFILES+=	4912c5a9454b.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
-PATCHFILES+=	00e5da6dd7a2.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
-PATCHFILES+=	b278fd6b4f57.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
-PATCHFILES+=	3f418c11d813.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
-PATCHFILES+=	39da5a00f3b3.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
-PATCHFILES+=	4a688ffec053.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
-PATCHFILES+=	8010e3d9ca00.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
-PATCHFILES+=	8ec2886673d3.patch:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/241
+PATCHFILES+=	4912c5a9454b.patch:-p1 # https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241
+PATCHFILES+=	00e5da6dd7a2.patch:-p1 # https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241
+PATCHFILES+=	b278fd6b4f57.patch:-p1 # https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241
+PATCHFILES+=	3f418c11d813.patch:-p1 # https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241
+PATCHFILES+=	39da5a00f3b3.patch:-p1 # https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241
+PATCHFILES+=	4a688ffec053.patch:-p1 # https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241
+PATCHFILES+=	8010e3d9ca00.patch:-p1 # https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241
+PATCHFILES+=	8ec2886673d3.patch:-p1 # https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Phone compositor
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wlroots>=0.14.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	${LOCALBASE}/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml:x11-wm/mutter
 
 USES=		compiler:c11 gl gnome meson pkgconfig python:build shebangfix xorg
 USE_GITLAB=	yes
 USE_GL=		glesv2
 USE_GNOME=	gnomedesktop3
 USE_XORG=	pixman xcb
-GL_SITE=	https://source.puri.sm
-GL_ACCOUNT=	Librem5
+GL_SITE=	https://gitlab.gnome.org
+GL_ACCOUNT=	World/Phosh
 GL_COMMIT=	8e51b02c7fb9b103d8e80fb77145dddfb4b5b3a2
 SHEBANG_FILES=	build-aux/post_install.py
 CFLAGS+=	-Wno-error=format-nonliteral # clang
 PLIST_FILES=	bin/${PORTNAME}
 GLIB_SCHEMAS=	sm.puri.phoc.gschema.xml
 
 post-extract:
 # Avoid confusing Meson instead of forcing -Dembed-wlroots=disabled
 	@${RMDIR} ${WRKSRC}/subprojects/wlroots
 .if defined(PATCHFILES) && ${PATCHFILES:M4912c5a9454b*}
 # Pretend to be a regular file for vendor patch to apply as is
 	@${ECHO_CMD} "Subproject commit 3d227f140e3c4af42d759477fc38e82a4c3dc4ef" \
 		>${WRKSRC}/subprojects/wlroots
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/phoc/distinfo b/x11-wm/phoc/distinfo
index 6429e891d338..3a137a46ee5b 100644
--- a/x11-wm/phoc/distinfo
+++ b/x11-wm/phoc/distinfo
@@ -1,19 +1,19 @@
 TIMESTAMP = 1623582410
-SHA256 (Librem5-phoc-8e51b02c7fb9b103d8e80fb77145dddfb4b5b3a2_GL0.tar.gz) = ac8b4723bde47f9b00f2ec73b0ae448c51670ba2294079cc93e41fab3764d24b
-SIZE (Librem5-phoc-8e51b02c7fb9b103d8e80fb77145dddfb4b5b3a2_GL0.tar.gz) = 143914
+SHA256 (World/Phosh-phoc-8e51b02c7fb9b103d8e80fb77145dddfb4b5b3a2_GL0.tar.gz) = ac8b4723bde47f9b00f2ec73b0ae448c51670ba2294079cc93e41fab3764d24b
+SIZE (World/Phosh-phoc-8e51b02c7fb9b103d8e80fb77145dddfb4b5b3a2_GL0.tar.gz) = 143914
 SHA256 (4912c5a9454b.patch) = dc833187095b92132df7cdef804e3aa5521cad360b43fc4370bd6b72e708c84f
 SIZE (4912c5a9454b.patch) = 23928
 SHA256 (00e5da6dd7a2.patch) = 123d7e9d13c178ef98fbeea55fedd1204061185fe3ea740333dc51ba6439fdbb
 SIZE (00e5da6dd7a2.patch) = 5575
 SHA256 (b278fd6b4f57.patch) = 851dcb0fa5a9cc537bdb71dc6ca30e19228580094ebbaf88c735af69a94640fa
 SIZE (b278fd6b4f57.patch) = 4110
 SHA256 (3f418c11d813.patch) = 45ca59ff8bcc4316286c814b6264d202866b561bbc431514537d9d86b51396de
 SIZE (3f418c11d813.patch) = 3930
 SHA256 (39da5a00f3b3.patch) = a479b5a3beb9e0d6a7ada708daeea93c6bddad28b98de2e490c3110d45426ca7
 SIZE (39da5a00f3b3.patch) = 2066
 SHA256 (4a688ffec053.patch) = 5c1ba160d978e2b2a6543db22b83ae9f54308684ed2475afaa1d01e2442cff32
 SIZE (4a688ffec053.patch) = 3583
 SHA256 (8010e3d9ca00.patch) = f485ed1d76c932d262752fd9d1b6bc242fa03c39b312b72cddfb8b8ef84d4ed2
 SIZE (8010e3d9ca00.patch) = 1378
 SHA256 (8ec2886673d3.patch) = 1524f637af620b62d6eecb043703ff0ab6615b1fecb2563880f179e6dae28c53
 SIZE (8ec2886673d3.patch) = 2753
diff --git a/x11-wm/phoc/pkg-descr b/x11-wm/phoc/pkg-descr
index 9751b374e8d1..4774094151a1 100644
--- a/x11-wm/phoc/pkg-descr
+++ b/x11-wm/phoc/pkg-descr
@@ -1,4 +1,4 @@
 Phoc aims to be a Wayland compositor targeted at mobile phones but
 also works for desktops and tablets.
 
-WWW: https://source.puri.sm/Librem5/phoc
+WWW: https://gitlab.gnome.org/World/Phosh/phoc