diff --git a/sysutils/znapzend/Makefile b/sysutils/znapzend/Makefile
index 3357b70b6b8e..788f95b3d854 100644
--- a/sysutils/znapzend/Makefile
+++ b/sysutils/znapzend/Makefile
@@ -1,45 +1,51 @@
 PORTNAME=	znapzend
-PORTVERSION=	0.21.2
+PORTVERSION=	0.22.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	ZFS-centric backup tool
 WWW=		https://www.znapzend.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	mbuffer>=0:misc/mbuffer \
 		p5-IO-Pipely>=0:devel/p5-IO-Pipely \
 		p5-Mojo-IOLoop-ForkCall>=0.21:www/p5-Mojo-IOLoop-ForkCall \
 		p5-Mojolicious>=7.15:www/p5-Mojolicious \
 		p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils
 RUN_DEPENDS=	mbuffer>=0:misc/mbuffer \
 		p5-IO-Pipely>=0:devel/p5-IO-Pipely \
 		p5-Mojo-IOLoop-ForkCall>=0.21:www/p5-Mojo-IOLoop-ForkCall \
 		p5-Mojolicious>=7.15:www/p5-Mojolicious \
 		p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils \
 		p5-Role-Tiny>=2:devel/p5-Role-Tiny \
 		p5-Mojo-Log-Clearable>=0:devel/p5-Mojo-Log-Clearable
 
 USES=		autoreconf gmake perl5
 USE_GITHUB=	yes
 GH_ACCOUNT=	oetiker
 USE_RC_SUBR=	znapzend
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--libdir=${SITE_PERL} \
 		--prefix=${PREFIX}
 CONFIGURE_ENV=	PERL5LIB=${SITE_PERL}
 NO_ARCH=	yes
 
 pre-configure:
 	@${REINPLACE_CMD} -e '/thirdparty\/Makefile/d' ${WRKSRC}/configure.ac
 
 post-configure:
 	@${REINPLACE_CMD} -e 's/thirdparty//g' ${WRKSRC}/Makefile
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/ZnapZend
+	@${MV} ${STAGEDIR}${PREFIX}/lib/perl5/lib/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+	@${MV} ${STAGEDIR}${PREFIX}/lib/perl5/lib/ZnapZend/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/ZnapZend
+	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/perl5/lib/ZnapZend
+	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/perl5/lib
+
 .include <bsd.port.mk>
diff --git a/sysutils/znapzend/distinfo b/sysutils/znapzend/distinfo
index 97a5d62f9d64..a270a98ddea6 100644
--- a/sysutils/znapzend/distinfo
+++ b/sysutils/znapzend/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1681416747
-SHA256 (oetiker-znapzend-v0.21.2_GH0.tar.gz) = eee02b52c63f8be066b3ad914a0483e6a626b4b5d8efda7a133f34ba66258aff
-SIZE (oetiker-znapzend-v0.21.2_GH0.tar.gz) = 227714
+TIMESTAMP = 1714841675
+SHA256 (oetiker-znapzend-v0.22.0_GH0.tar.gz) = 0801b667d3daa4d6c79fea9e846cb21f9e2fab221f74520fa037fbedc8f3f23a
+SIZE (oetiker-znapzend-v0.22.0_GH0.tar.gz) = 243333
diff --git a/sysutils/znapzend/files/znapzend.in b/sysutils/znapzend/files/znapzend.in
index a997c9355643..27d624f78c08 100644
--- a/sysutils/znapzend/files/znapzend.in
+++ b/sysutils/znapzend/files/znapzend.in
@@ -1,30 +1,30 @@
 #!/bin/sh
 
 # PROVIDE: znapzend
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable znapzend:
 # znapzend_enable (bool):	Set to "NO" by default.
 #				Set it to "YES" to enable znapzend.
 #
 
 . /etc/rc.subr
 
 name=znapzend
 desc="Znapzend backup daemon"
 rcvar=znapzend_enable
 
 load_rc_config $name
 
 : ${znapzend_enable:=NO}
 
 extra_commands=reload
-command_interpreter=/usr/local/bin/perl
+command_interpreter=%%LOCALBASE%%/bin/perl
 sig_reload=HUP
 pidfile=/var/run/${name}.pid
 command=%%PREFIX%%/bin/${name}
 command_args="--daemonize --pidfile=${pidfile} --logto=/var/log/znapzend.log"
 
 run_rc_command "$1"