diff --git a/sysutils/zrepl/Makefile b/sysutils/zrepl/Makefile
index fbc765037c21..38ded8f82ac8 100644
--- a/sysutils/zrepl/Makefile
+++ b/sysutils/zrepl/Makefile
@@ -1,65 +1,64 @@
 # Created by: Nikolai Lifanov <lifanov@FreeBSD.org> and Ben Woods <woodsb02@FreeBSD.org>
 
 PORTNAME=	zrepl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.1
-PORTREVISION=	2
+DISTVERSION=	0.4.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	ZFS dataset replication tool
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake go:modules
 USE_RC_SUBR=	zrepl
 
 GO_MODULE=	github.com/${PORTNAME}/${PORTNAME}
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		EXAMPLES MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 
 MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.8.5,1:textproc/py-sphinx@${PY_FLAVOR}
 MANPAGES_USES=		python:build,3.6+
 MANPAGES_PLIST_FILES=	man/man1/zrepl.1.gz
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079
 USES+=		ncurses
 .else
 USES+=		ncurses:port
 CFLAGS+=	-I${LOCALBASE}/include/ncurses
 .endif
 
 .if ${OPSYS} == "FreeBSD"
 SUB_LIST+=	DAEMON_LOGGING="-S -l \$${zrepl_facility} -s \$${zrepl_priority} -T \$${name}"
 .else
 SUB_LIST+=	DAEMON_LOGGING=""
 .endif
 
 post-build-MANPAGES-on:
 	@${MAKE_CMD} -C ${WRKSRC}/docs SPHINXBUILD=sphinx-build-${PYTHON_VER} man
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} \
 		${STAGEDIR}${ETCDIR} \
 		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d \
 		${STAGEDIR}${PREFIX}/etc/syslog.d \
 		${STAGEDIR}/var/run/zrepl
 	${INSTALL_DATA} ${FILESDIR}/newsyslog.conf ${STAGEDIR}${EXAMPLESDIR}/newsyslog.conf
 	${INSTALL_DATA} ${FILESDIR}/syslog.conf ${STAGEDIR}${EXAMPLESDIR}/syslog.conf
 	${INSTALL_DATA} ${FILESDIR}/zrepl.yml ${STAGEDIR}${ETCDIR}/zrepl.yml.sample
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/hooks
 	(cd ${WRKSRC}/config/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	${INSTALL_DATA} ${WRKSRC}/dist/grafana/grafana-prometheus-zrepl.json ${STAGEDIR}${EXAMPLESDIR}
 
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/docs/_build/man/zrepl.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/zrepl/distinfo b/sysutils/zrepl/distinfo
index 754c67b6b316..88b4ab9a7667 100644
--- a/sysutils/zrepl/distinfo
+++ b/sysutils/zrepl/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1621651083
-SHA256 (go/sysutils_zrepl/zrepl-v0.3.1/v0.3.1.mod) = e809ef564d8187410ba9423bcc2c6abe992907674d5d4a4a471ebe8ea5513a04
-SIZE (go/sysutils_zrepl/zrepl-v0.3.1/v0.3.1.mod) = 2164
-SHA256 (go/sysutils_zrepl/zrepl-v0.3.1/v0.3.1.zip) = 79b707d7cf50329c9566367ae5459cbba483117269cac19c39756dc0abc4e30a
-SIZE (go/sysutils_zrepl/zrepl-v0.3.1/v0.3.1.zip) = 520921
+TIMESTAMP = 1621953202
+SHA256 (go/sysutils_zrepl/zrepl-v0.4.0/v0.4.0.mod) = 62e77080cd47c24eb90eb7c0a9d61f91bd5b5eb07bd23690c417b54d52acb0c6
+SIZE (go/sysutils_zrepl/zrepl-v0.4.0/v0.4.0.mod) = 2646
+SHA256 (go/sysutils_zrepl/zrepl-v0.4.0/v0.4.0.zip) = 81d3e8e32833f51aa6892a4a78c30eca7ca43dcd2bfb0039235aa854292a7afb
+SIZE (go/sysutils_zrepl/zrepl-v0.4.0/v0.4.0.zip) = 551435