diff --git a/emulators/qemu-cheri/Makefile b/emulators/qemu-cheri/Makefile
index fab86bfed1d9..fb935681a0e3 100644
--- a/emulators/qemu-cheri/Makefile
+++ b/emulators/qemu-cheri/Makefile
@@ -1,77 +1,76 @@
 PORTNAME=	qemu
 PORTVERSION=	0.d${SNAPDATE}
 PORTREVISION=	0
 CATEGORIES=	emulators devel
 PKGNAMESUFFIX=	-cheri
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT?=	QEMU emulator with CHERI CPU support
 WWW=		https://github.com/CTSRD-CHERI/qemu
 
 # XXX: disabling gnutls doesn't work so depend on it to avoid breakage.
 BUILD_DEPENDS=	bash:shells/bash \
 		meson>=0.57.1_1:devel/meson
 LIB_DEPENDS=	libcapstone.so:devel/capstone \
 		libdrm.so:graphics/libdrm \
 		libepoxy.so:graphics/libepoxy \
 		libgnutls.so:security/gnutls \
 		libnettle.so:security/nettle
 RUN_DEPENDS=	qemu-system-i386:emulators/qemu
 
 LICENSE=	GPLv2
 
 USE_GITHUB=	yes
 GH_TUPLE=	CTSRD-CHERI:qemu:${QEMU_COMMIT} \
-		qemu:dtc:85e5d83:qemu_dtc/dtc \
-		qemu:libslirp:487f4bf4:qemu_libslirp/slirp \
+		qemu:dtc:b6910be:qemu_dtc/dtc \
+		qemu:libslirp:a88d9ac:qemu_libslirp/slirp \
 		qemu:berkeley-softfloat-3:b64af41:qemu_berkeley_softfloat_3/tests/fp/berkeley-softfloat-3 \
-		qemu:berkeley-testfloat-3:ca9fa2b:qemu_berkeley_testfloat_3/tests/fp/berkeley-testfloat-3 \
-		qemu:keycodemapdb:6b3d716:qemu_keycodemapdb/ui/keycodemapdb \
+		qemu:berkeley-testfloat-3:40619cb:qemu_berkeley_testfloat_3/tests/fp/berkeley-testfloat-3 \
+		qemu:keycodemapdb:d21009b:qemu_keycodemapdb/ui/keycodemapdb \
 
 HAS_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 USES=		cpe gmake gnome ninja:build perl5 pkgconfig python:build xorg
 USE_XORG=	pixman
 USE_GNOME+=	glib20 libxml2
 USE_PERL5=	build
 USE_GL+=	gl
 ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 
 OPTIONS_DEFINE=	DOCS
 
 .include "Makefile.snapshot"
 
 CONFIGURE_ARGS+= \
 		--target-list=riscv64cheri-softmmu,morello-softmmu \
 		--disable-curl \
-		--disable-git-update \
 		--disable-gtk \
 		--disable-linux-user \
 		--disable-linux-aio \
 		--disable-kvm \
 		--disable-opengl \
 		--disable-vnc-png \
 		--disable-sdl \
 		--disable-vte \
 		--disable-xen \
 		--meson=${LOCALBASE}/bin/meson \
 		--smbd=${LOCALBASE}/sbin/smbd \
 		--extra-cflags="-g ${EXTRA_CFLAGS}" \
 		--localstatedir=/var
 EXTRA_CFLAGS=	-DCHERI_UNALIGNED
 
 PLIST_FILES=	bin/qemu-system-morello \
-		bin/qemu-system-riscv64cheri
+		bin/qemu-system-riscv64xcheri
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/build/qemu-system-morello \
-	    ${WRKSRC}/build/qemu-system-riscv64cheri \
+	    ${WRKSRC}/build/qemu-system-riscv64xcheri \
 	    ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/emulators/qemu-cheri/Makefile.snapshot b/emulators/qemu-cheri/Makefile.snapshot
index 48d8759ffb9b..8793cf5502cb 100644
--- a/emulators/qemu-cheri/Makefile.snapshot
+++ b/emulators/qemu-cheri/Makefile.snapshot
@@ -1,7 +1,7 @@
 # Generated file!  Do not edit!  
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-SNAPDATE=	20230628
+SNAPDATE=	20260108
 
-QEMU_COMMIT=		7d0b88cfb982267676573a4dce6565c7518964ca
+QEMU_COMMIT=		0f0babda7d12acacccc43cca341645dd8c47e693
diff --git a/emulators/qemu-cheri/distinfo b/emulators/qemu-cheri/distinfo
index 948790d4d3ed..86996374a934 100644
--- a/emulators/qemu-cheri/distinfo
+++ b/emulators/qemu-cheri/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1689619889
-SHA256 (CTSRD-CHERI-qemu-0.d20230628-7d0b88cfb982267676573a4dce6565c7518964ca_GH0.tar.gz) = 19fe20230fcc6fcc4872a126a010b63dc945470dc0917dd86586b231df2ac720
-SIZE (CTSRD-CHERI-qemu-0.d20230628-7d0b88cfb982267676573a4dce6565c7518964ca_GH0.tar.gz) = 30672863
-SHA256 (qemu-dtc-85e5d83_GH0.tar.gz) = 3507d8e96d1942493128591b518c522cfd56d7779ce53283b2cf33661b809479
-SIZE (qemu-dtc-85e5d83_GH0.tar.gz) = 200566
-SHA256 (qemu-libslirp-487f4bf4_GH0.tar.gz) = 92b459875d1113db42a1cb1406f26c191b7c4af4d4ef7eed70eae2b4e55fc1ab
-SIZE (qemu-libslirp-487f4bf4_GH0.tar.gz) = 131446
+TIMESTAMP = 1774059927
+SHA256 (CTSRD-CHERI-qemu-0.d20260108-0f0babda7d12acacccc43cca341645dd8c47e693_GH0.tar.gz) = 5444d22162e5786eb0acceaf303ca4c5e3a74b56e818b4de72f23447a88d22c4
+SIZE (CTSRD-CHERI-qemu-0.d20260108-0f0babda7d12acacccc43cca341645dd8c47e693_GH0.tar.gz) = 32233888
+SHA256 (qemu-dtc-b6910be_GH0.tar.gz) = 58580ec6a3e9c6a1bb3671cd26eefaa28d03e29e8d78c19cb4955e91c4a5e761
+SIZE (qemu-dtc-b6910be_GH0.tar.gz) = 205421
+SHA256 (qemu-libslirp-a88d9ac_GH0.tar.gz) = 71c65f8df34af28a3253334db37ce20dece948665cc2c25969f5d6a91e00ccca
+SIZE (qemu-libslirp-a88d9ac_GH0.tar.gz) = 135631
 SHA256 (qemu-berkeley-softfloat-3-b64af41_GH0.tar.gz) = f22bf52cc980b122c663f2e22f8098fa60d8e468e0095f1da58231235a6b324e
 SIZE (qemu-berkeley-softfloat-3-b64af41_GH0.tar.gz) = 148768
-SHA256 (qemu-berkeley-testfloat-3-ca9fa2b_GH0.tar.gz) = 6df3f2dee4a1b50521d7270c89392fa4ba8ca80f6dbaba92816e03e517269562
-SIZE (qemu-berkeley-testfloat-3-ca9fa2b_GH0.tar.gz) = 138959
-SHA256 (qemu-keycodemapdb-6b3d716_GH0.tar.gz) = c9d3412510aac999865d01aaa14b1fa8dc0385db55c5cf6c4d95d160bd0eaee9
-SIZE (qemu-keycodemapdb-6b3d716_GH0.tar.gz) = 47905
+SHA256 (qemu-berkeley-testfloat-3-40619cb_GH0.tar.gz) = 33a9fa720eb9277b36ae02a13e5cbec4b18727453dde1bf94ae26c3943c1c795
+SIZE (qemu-berkeley-testfloat-3-40619cb_GH0.tar.gz) = 139030
+SHA256 (qemu-keycodemapdb-d21009b_GH0.tar.gz) = 74fbc9967e5e2f7473c89f13156458a66bdaac6b79b64d90fe62b8924185d261
+SIZE (qemu-keycodemapdb-d21009b_GH0.tar.gz) = 49162