diff --git a/graphics/crucible/Makefile b/graphics/crucible/Makefile
index cf2aea13a836..2e6cd6fa7c5e 100644
--- a/graphics/crucible/Makefile
+++ b/graphics/crucible/Makefile
@@ -1,38 +1,43 @@
 PORTNAME=	crucible
 DISTVERSION=	g20260429
 CATEGORIES=	graphics
 
+PATCH_SITES=	https://github.com/ocochard/crucible/commit/
+PATCHFILES=	2b898ed7107178224b451728f15672dc1733121d.patch:-p1 \
+		384620d1fcb58cdb20a5594aac3d5a5844dfd757.patch:-p1
+
 MAINTAINER=	olivier@FreeBSD.org
 COMMENT=	Vulkan test suite
 WWW=		https://gitlab.freedesktop.org/mesa/crucible
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 		a2x:textproc/asciidoc \
 		${PYTHON_PKGNAMEPREFIX}opencv-python-headless>0:graphics/py-opencv-python-headless@${PY_FLAVOR}
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libxml2.so:textproc/libxml2 \
 		libvulkan.so:graphics/vulkan-loader \
 		libepoll-shim.so:devel/libepoll-shim
 
 USES=		meson pkgconfig python:build
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	ocochard
-GH_TAGNAME=	384620d
+USE_GITLAB=	yes
+GL_SITE=	https://gitlab.freedesktop.org
+GL_ACCOUNT=	mesa
+GL_TAGNAME=	1b6b04dfb0c4f94bf08b6b5cd0c3f4520da9bc6b
 
 CFLAGS+=	-DCRUCIBLE_DATA_DIR=${DATADIR}/data
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/crucible ${STAGEDIR}${PREFIX}/bin/
 .for m in 1 7
 	${INSTALL_MAN} ${BUILD_WRKSRC}/doc/*.${m} ${STAGEDIR}${PREFIX}/share/man/man${m}/
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}/data
 	cd ${BUILD_WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/data
 
 .include <bsd.port.mk>
diff --git a/graphics/crucible/distinfo b/graphics/crucible/distinfo
index 96c2edf29222..504551a5bb33 100644
--- a/graphics/crucible/distinfo
+++ b/graphics/crucible/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1777469399
-SHA256 (ocochard-crucible-g20260429-384620d_GH0.tar.gz) = 277495109a01a436fa795f3d8288709a161501784dfef95e4611a96109badf19
-SIZE (ocochard-crucible-g20260429-384620d_GH0.tar.gz) = 7594270
+TIMESTAMP = 1777559072
+SHA256 (mesa-crucible-1b6b04dfb0c4f94bf08b6b5cd0c3f4520da9bc6b_GL0.tar.gz) = 1e54548eb6ae451d65ace6683f0f80e3b5bbd3cb1ca8abe96c7bc5f4140fceb0
+SIZE (mesa-crucible-1b6b04dfb0c4f94bf08b6b5cd0c3f4520da9bc6b_GL0.tar.gz) = 7594220
+SHA256 (2b898ed7107178224b451728f15672dc1733121d.patch) = 1edeab80c75c001c3caa68934806f4fd9b72bee955205a6c7470a8a1d7f6a38b
+SIZE (2b898ed7107178224b451728f15672dc1733121d.patch) = 6312
+SHA256 (384620d1fcb58cdb20a5594aac3d5a5844dfd757.patch) = 1c2e38bf7bc61664a37d5ff0fdaae68b4d9a5a1af999520ba10fa0c52f34c1a8
+SIZE (384620d1fcb58cdb20a5594aac3d5a5844dfd757.patch) = 1186