diff --git a/sysutils/zrepl-dsh2dsh/Makefile b/sysutils/zrepl-dsh2dsh/Makefile
index d7730883bc8d..a190fc7e7294 100644
--- a/sysutils/zrepl-dsh2dsh/Makefile
+++ b/sysutils/zrepl-dsh2dsh/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	zrepl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.5
+DISTVERSION=	0.8.9
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-dsh2dsh
 
 MAINTAINER=	dsh@bamus.cz
 COMMENT=	ZFS dataset replication tool (fork with more features)
 WWW=		https://github.com/dsh2dsh/${PORTNAME}
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:1.23,modules ncurses
 
 GO_MODULE=	github.com/dsh2dsh/${PORTNAME}
-GO_BUILDFLAGS=	-ldflags "${STRIP} -w -X github.com/dsh2dsh/${PORTNAME}/version.${PORTNAME}Version=${DISTVERSIONFULL}"
+GO_BUILDFLAGS=	-ldflags "${STRIP} -w -X github.com/dsh2dsh/${PORTNAME}/internal/version.${PORTNAME}Version=${DISTVERSIONFULL}"
 
 CONFLICTS_INSTALL=	${PORTNAME}
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|/usr/local/etc/${PORTNAME}|${ETCDIR}|g' \
 		-e 's|/usr/local|${PREFIX}|g' \
 		${WRKSRC}/dist/freebsd/etc/periodic/daily/${PORTNAME} \
 		${WRKSRC}/dist/freebsd/etc/periodic/weekly/500.${PORTNAME} \
 		${WRKSRC}/dist/freebsd/etc/rc.d/${PORTNAME}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR} \
 		${STAGEDIR}${EXAMPLESDIR} \
 		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d \
 		${STAGEDIR}${PREFIX}/etc/periodic/daily \
 		${STAGEDIR}${PREFIX}/etc/periodic/weekly
 	${INSTALL_SCRIPT} ${WRKSRC}/dist/freebsd/etc/rc.d/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/etc/rc.d
 	${INSTALL_DATA} \
 		${WRKSRC}/dist/freebsd/etc/newsyslog.conf.d/${PORTNAME}.conf \
 		${STAGEDIR}${EXAMPLESDIR}/newsyslog.conf
 	${INSTALL_DATA} ${WRKSRC}/dist/freebsd/etc/${PORTNAME}/${PORTNAME}.yml \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}.yml.sample
 	${INSTALL_SCRIPT} \
 		${WRKSRC}/dist/freebsd/etc/periodic/daily/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/etc/periodic/daily/${PORTNAME}
 	${INSTALL_SCRIPT} \
 		${WRKSRC}/dist/freebsd/etc/periodic/weekly/500.${PORTNAME} \
 		${STAGEDIR}${PREFIX}/etc/periodic/weekly/500.${PORTNAME}
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/hooks
-	(cd ${WRKSRC}/config/samples && \
+	(cd ${WRKSRC}/internal/config/samples && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	${INSTALL_DATA} \
 		${WRKSRC}/dist/grafana/grafana-prometheus-${PORTNAME}.json \
 		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/zrepl-dsh2dsh/distinfo b/sysutils/zrepl-dsh2dsh/distinfo
index 1a33ef83c56b..6f28a3b3592c 100644
--- a/sysutils/zrepl-dsh2dsh/distinfo
+++ b/sysutils/zrepl-dsh2dsh/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1728757205
-SHA256 (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.5/v0.8.5.mod) = fa6b007413229b4bcba2c4871c96a3024f0cd52e8a42b0e60ff844bff0a8a2c5
-SIZE (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.5/v0.8.5.mod) = 3490
-SHA256 (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.5/v0.8.5.zip) = b209f3417f5c1b5b4dee485eda8e54aec73689f3784333252c1fe001aa42fd62
-SIZE (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.5/v0.8.5.zip) = 605727
+TIMESTAMP = 1729520199
+SHA256 (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.9/v0.8.9.mod) = b1328a874b06ec042040304ef051aed69ba12d870b69789e77f3db456cf99946
+SIZE (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.9/v0.8.9.mod) = 3490
+SHA256 (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.9/v0.8.9.zip) = f0dbf0e40feb60e811dc46505eb9df0de82afe3b354c0d0d44945fcfb0dc49c8
+SIZE (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.9/v0.8.9.zip) = 600710