diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	veloren
 PORTVERSION=	s20240119
+PORTREVISION=	1
 CATEGORIES=	games wayland
 PKGNAMESUFFIX=	-weekly
 
@@ -14,23 +15,27 @@
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 ONLY_FOR_ARCHS_REASON=	unsupported platform by https://github.com/wasmerio/wasmer
 
+SUBPACKAGES=	cli data
+
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libudev.so:devel/libudev-devd \
 		libshaderc_shared.so:graphics/shaderc
 RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
 		${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
+SELF_DEPENDS.main=	data
+SELF_DEPENDS.cli=	data
 
 USES=		cargo xorg
 USE_XORG=	xcb
 USE_GITLAB=	yes
 GL_TAGNAME=	v0.15.0-851-g33126c877 # git describe --match='v[0-9]*' weekly
 CARGO_ENV=	VELOREN_USERDATA_STRATEGY=system SHADERC_LIB_DIR="${LOCALBASE}/lib"
-PLIST_FILES=	bin/${PORTNAME}-server-cli \
-		bin/${PORTNAME}-voxygen \
+PLIST_FILES.cli=bin/${PORTNAME}-server-cli
+PLIST_FILES=	bin/${PORTNAME}-voxygen \
 		share/applications/net.veloren.veloren.desktop \
 		share/metainfo/net.veloren.veloren.metainfo.xml \
 		share/pixmaps/net.veloren.veloren.png
-PORTDATA=	*
+#PORTDATA.data=*
 
 CONFLICTS_INSTALL=	${PORTNAME}
 
@@ -76,5 +81,8 @@
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo
 	${RLN} ${STAGEDIR}${DATADIR}/assets/voxygen/*.metainfo.xml \
 		${STAGEDIR}${PREFIX}/share/metainfo
+# XXX Drop after uncommenting PORTDATA.data
+	@${FIND} ${STAGEDIR}${DATADIR} ! -type d | ${SED} \
+		's,${STAGEDIR}${PREFIX}/,@@data@@,' >>${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/games/veloren-weekly/pkg-message b/games/veloren-weekly/pkg-message
new file mode 100644
--- /dev/null
+++ b/games/veloren-weekly/pkg-message
@@ -0,0 +1,8 @@
+[
+{ type: upgrade
+  maximum_version: "s20240119"
+  message: <<EOD
+veloren-server-cli executable moved to veloren-weekly-cli package
+EOD
+}
+]