diff --git a/x11/libxcvt/Makefile b/x11/libxcvt/Makefile
index b19de08dd142..9a2b4dcd3118 100644
--- a/x11/libxcvt/Makefile
+++ b/x11/libxcvt/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	libxcvt
 PORTVERSION=	s20210325
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Calculate VESA CVT mode lines
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		meson
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.freedesktop.org
-GL_ACCOUNT=	ofourdan
+GL_ACCOUNT=	xorg/lib
 GL_COMMIT=	81747a3d1270edb4d9df8f133206914512f604fe
 
 .include <bsd.port.mk>
diff --git a/x11/libxcvt/distinfo b/x11/libxcvt/distinfo
index 98509d58dd39..c7533ad06cf5 100644
--- a/x11/libxcvt/distinfo
+++ b/x11/libxcvt/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1617892694
-SHA256 (ofourdan-libxcvt-81747a3d1270edb4d9df8f133206914512f604fe_GL0.tar.gz) = 23f6a3f7da9b0db64297585bcdff2b239c8ee48bbb816f4534bc6910ee19bf8d
-SIZE (ofourdan-libxcvt-81747a3d1270edb4d9df8f133206914512f604fe_GL0.tar.gz) = 8397
+SHA256 (xorg/lib-libxcvt-81747a3d1270edb4d9df8f133206914512f604fe_GL0.tar.gz) = 23f6a3f7da9b0db64297585bcdff2b239c8ee48bbb816f4534bc6910ee19bf8d
+SIZE (xorg/lib-libxcvt-81747a3d1270edb4d9df8f133206914512f604fe_GL0.tar.gz) = 8397
diff --git a/x11/libxcvt/pkg-descr b/x11/libxcvt/pkg-descr
index 9e1c62d52cc8..ed171004250e 100644
--- a/x11/libxcvt/pkg-descr
+++ b/x11/libxcvt/pkg-descr
@@ -1,8 +1,8 @@
 libxcvt is a library providing a standalone version of the X server
 implementation of the VESA CVT standard timing modelines generator.
 
 libxcvt also provides a standalone version of the command line tool
 cvt copied from the Xorg implementation and is meant to be a direct
 replacement to the version provided by the Xorg server.
 
-WWW: https://gitlab.freedesktop.org/ofourdan/libxcvt
+WWW: https://gitlab.freedesktop.org/xorg/lib/libxcvt