diff --git a/x11-wm/labwc/Makefile b/x11-wm/labwc/Makefile
index b20b5e4a21aa..de9f4b68cb4d 100644
--- a/x11-wm/labwc/Makefile
+++ b/x11-wm/labwc/Makefile
@@ -1,54 +1,53 @@
 PORTNAME=	labwc
 DISTVERSION=	0.3.0
 PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Wayland stacking compositor
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols \
 		wlroots>=0.14.0<0.15.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 gnome meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GNOME=	cairo libxml2 pango
 USE_XORG=	pixman
-GH_ACCOUNT=	johanmalm
 PLIST_FILES=	bin/${PORTNAME}
 
 OPTIONS_DEFINE=	MANPAGES X11
 OPTIONS_DEFAULT=MANPAGES X11
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz \
 			man/man5/${PORTNAME}-actions.5.gz \
 			man/man5/${PORTNAME}-config.5.gz \
 			man/man5/${PORTNAME}-environment.5.gz \
 			man/man5/${PORTNAME}-menu.5.gz \
 			man/man5/${PORTNAME}-theme.5.gz
 
 X11_MESON_ENABLED=	xwayland
 
 post-extract:
 # Force system dependencies
 	@${RM} ${WRKSRC}/subprojects/*.wrap
 
 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
 # Respect PREFIX for system-wide config and Openbox themes
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
 		-e 's,/usr/local,${PREFIX},' \
 		${WRKSRC}/docs/${PORTNAME}-config.5.scd \
 		${WRKSRC}/src/common/dir.c
 
 .include <bsd.port.mk>
diff --git a/x11-wm/labwc/distinfo b/x11-wm/labwc/distinfo
index a6ae23dea25a..e1bba827eb17 100644
--- a/x11-wm/labwc/distinfo
+++ b/x11-wm/labwc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624910383
-SHA256 (johanmalm-labwc-0.3.0_GH0.tar.gz) = 035ae57bfdfa2b6453d07359cb0baf3c7ffd8192db63316a0f48db589c025787
-SIZE (johanmalm-labwc-0.3.0_GH0.tar.gz) = 69020
+TIMESTAMP = 1637485788
+SHA256 (labwc-labwc-0.3.0_GH0.tar.gz) = 035ae57bfdfa2b6453d07359cb0baf3c7ffd8192db63316a0f48db589c025787
+SIZE (labwc-labwc-0.3.0_GH0.tar.gz) = 69020
diff --git a/x11-wm/labwc/pkg-descr b/x11-wm/labwc/pkg-descr
index b3044dd644c6..9db270711c73 100644
--- a/x11-wm/labwc/pkg-descr
+++ b/x11-wm/labwc/pkg-descr
@@ -1,18 +1,18 @@
 Labwc stands for Lab Wayland Compositor, with lab indicating a sense
 of experimentation and treading new ground.
 
 It is a wlroots-based stacking compositor aiming to be light-weight
 and independent, with a focus on simply stacking windows well and
 rendering some window decorations. It relies on clients for
 wall-paper, panels, screenshots, and so on to create a full desktop
 environment.
 
 Labwc tries to stay in keeping with wlroots and sway in terms of
 general approach and coding style.
 
 In order to avoid re-inventing configuration & theme syntax,
 openbox-3.4 specification is used. This does not mean that labwc is an
 openbox clone but rather that configuration files will look and feel
 familiar.
 
-WWW: https://github.com/johanmalm/labwc
+WWW: https://github.com/labwc/labwc