diff --git a/sysutils/czkawka/Makefile b/sysutils/czkawka/Makefile
--- a/sysutils/czkawka/Makefile
+++ b/sysutils/czkawka/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	czkawka
 DISTVERSION=	6.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -11,12 +11,14 @@
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+SUBPACKAGES=	cli
+
 USES=		cargo gnome
 USE_GITHUB=	yes
 USE_GNOME=	gdkpixbuf2 gtk40
 GH_ACCOUNT=	qarmin
-PLIST_FILES=	bin/${PORTNAME}_cli \
-		bin/${PORTNAME}_gui \
+PLIST_FILES.cli=bin/${PORTNAME}_cli
+PLIST_FILES=	bin/${PORTNAME}_gui \
 		share/applications/com.github.qarmin.czkawka.desktop \
 		share/icons/hicolor/scalable/apps/com.github.qarmin.czkawka-symbolic.svg \
 		share/icons/hicolor/scalable/apps/com.github.qarmin.czkawka.Devel.svg \
@@ -25,7 +27,7 @@
 		${NULL}
 
 # XXX https://github.com/rust-lang/cargo/issues/4101
-CARGO_INSTALL_PATH=	${PLIST_FILES:Mbin/*:T}
+CARGO_INSTALL_PATH=	${PLIST_FILES:Mbin/*:T} ${PLIST_FILES.cli:T}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/*.desktop \
diff --git a/sysutils/czkawka/pkg-message b/sysutils/czkawka/pkg-message
new file mode 100644
--- /dev/null
+++ b/sysutils/czkawka/pkg-message
@@ -0,0 +1,8 @@
+[
+{ type: upgrade
+  maximum_version: "6.1.0_3"
+  message: <<EOD
+czkawka_cli executable moved to czkawka-cli package
+EOD
+}
+]