diff --git a/x11/waylock/Makefile b/x11/waylock/Makefile
index cd7e7d7191ed..280297e08a32 100644
--- a/x11/waylock/Makefile
+++ b/x11/waylock/Makefile
@@ -1,46 +1,52 @@
 PORTNAME=	waylock
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.4
 CATEGORIES=	x11 wayland
+MASTER_SITES=	https://codeberg.org/ifreund/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ \
+		https://codeberg.org/ifreund/zig-wayland/archive/65475ba${EXTRACT_SUFX}?dummy=/:zig_wayland \
+		https://codeberg.org/ifreund/zig-xkbcommon/archive/7b188de${EXTRACT_SUFX}?dummy=/:zig_xkbcommon
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		zig-wayland-65475ba${EXTRACT_SUFX}:zig_wayland \
+		zig-xkbcommon-7b188de${EXTRACT_SUFX}:zig_xkbcommon
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Small screenlocker for Wayland compositors
-WWW=		https://github.com/ifreund/waylock
+WWW=		https://codeberg.org/ifreund/waylock
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols \
 		zig>=0.11.0:lang/zig
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	unix-selfauth-helper>0:security/unix-selfauth-helper
 
 USES=		pkgconfig
-USE_GITHUB=	yes
-GH_ACCOUNT=	ifreund
-GH_TUPLE=	ifreund:zig-wayland:65475ba:zig_wayland/deps/zig-wayland \
-		ifreund:zig-xkbcommon:7b188de:zig_xkbcommon/deps/zig-xkbcommon
+WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_ENV=	DESTDIR="${STAGEDIR}"
 CONFIGURE_ARGS=	--prefix "${PREFIX}" \
 		${WITH_DEBUG:D:U-Doptimize=ReleaseFast} \
 		${WITH_PIE:D-Dpie} \
 		${STRIP:C/.+/-Dstrip/} \
 		-Dcpu=${CPUTYPE:Ubaseline} \
 		--verbose
 NO_INSTALL=	yes # strip(1) breaks runtime
 PLIST_FILES=	bin/${PORTNAME} \
 		etc/pam.d/${PORTNAME}
 
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_CONFIGURE_ON=	-Dman-pages=true
 MANPAGES_CONFIGURE_OFF=	-Dman-pages=false
 MANPAGES_PLIST_FILES=	share/man/man1/${PORTNAME}.1.gz
 
+post-extract:
+	@${MV} ${WRKDIR}/zig-* ${WRKSRC}/deps
+
 do-build:
 	@(cd ${WRKSRC} && ${MAKE_ENV} zig build ${CONFIGURE_ARGS})
 
 .include <bsd.port.mk>
diff --git a/x11/waylock/distinfo b/x11/waylock/distinfo
index 721d27e9a26b..4d157dfd366d 100644
--- a/x11/waylock/distinfo
+++ b/x11/waylock/distinfo
@@ -1,7 +1,7 @@
 TIMESTAMP = 1704942460
-SHA256 (ifreund-waylock-v0.6.4_GH0.tar.gz) = 0f838000d78bb896262565d843e9357915d65892d8f03a5c6d5be028a8017cf2
-SIZE (ifreund-waylock-v0.6.4_GH0.tar.gz) = 19243
-SHA256 (ifreund-zig-wayland-65475ba_GH0.tar.gz) = 51c3f10e44ddc829d259b96e01ce135ccb564f1851f1f8bb0552516aa3b3f9c2
-SIZE (ifreund-zig-wayland-65475ba_GH0.tar.gz) = 56249
-SHA256 (ifreund-zig-xkbcommon-7b188de_GH0.tar.gz) = 2c55d221c7a3483b38669cd19f7ccbc16a6429fc365e497aff4cd23b762317f5
-SIZE (ifreund-zig-xkbcommon-7b188de_GH0.tar.gz) = 21749
+SHA256 (waylock-v0.6.4.tar.gz) = acac075525ee4556a4a3f6dae3d97867e262f12e2ca2b59d7e63ff1e6effb45e
+SIZE (waylock-v0.6.4.tar.gz) = 19236
+SHA256 (zig-wayland-65475ba.tar.gz) = b9f4d8b481bbcbee53b27333d4474b0cda1d5746036f23e9eca84f00e984d552
+SIZE (zig-wayland-65475ba.tar.gz) = 56234
+SHA256 (zig-xkbcommon-7b188de.tar.gz) = ff71b52b8f9c106981ec92db265ef155dd4543aee4c4a0c60f37eab72aa6a208
+SIZE (zig-xkbcommon-7b188de.tar.gz) = 21739