diff --git a/sysutils/zrepl-dsh2dsh/Makefile b/sysutils/zrepl-dsh2dsh/Makefile
index b299d4a4ec61..a390e0b354fe 100644
--- a/sysutils/zrepl-dsh2dsh/Makefile
+++ b/sysutils/zrepl-dsh2dsh/Makefile
@@ -1,47 +1,49 @@
 PORTNAME=	zrepl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.3
-PORTREVISION=	1
+DISTVERSION=	0.8.4
 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
 USE_RC_SUBR=	${PORTNAME}
 
 GO_MODULE=	github.com/dsh2dsh/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "${STRIP} -w -X github.com/dsh2dsh/${PORTNAME}/version.${PORTNAME}Version=${DISTVERSIONFULL}"
 
 CONFLICTS_INSTALL=	${PORTNAME}
 
-SUB_FILES=	pkg-message 500.${PORTNAME}
+SUB_FILES=	pkg-message 500.${PORTNAME} ${PORTNAME}.daily
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR} \
 		${STAGEDIR}${ETCDIR} \
 		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${INSTALL_DATA} ${FILESDIR}/newsyslog.conf \
 		${STAGEDIR}${EXAMPLESDIR}/newsyslog.conf
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.yml \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}.yml.sample
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/weekly
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily \
+		${STAGEDIR}${PREFIX}/etc/periodic/weekly
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.daily \
+		${STAGEDIR}${PREFIX}/etc/periodic/daily/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/500.${PORTNAME} \
 		${STAGEDIR}${PREFIX}/etc/periodic/weekly/500.${PORTNAME}
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/hooks
 	(cd ${WRKSRC}/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 ed630c91e26f..ca1e66007623 100644
--- a/sysutils/zrepl-dsh2dsh/distinfo
+++ b/sysutils/zrepl-dsh2dsh/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1726766984
-SHA256 (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.3/v0.8.3.mod) = 6d039a394e4025517e66e4f016d60b5299d1541dca23913e1a8fa96bbedece12
-SIZE (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.3/v0.8.3.mod) = 3638
-SHA256 (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.3/v0.8.3.zip) = ba1ec6e71bb449d6e01b477387cbb003c55cb66f7820f141ce4135f862a9776c
-SIZE (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.3/v0.8.3.zip) = 602193
+TIMESTAMP = 1727718613
+SHA256 (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.4/v0.8.4.mod) = 6d039a394e4025517e66e4f016d60b5299d1541dca23913e1a8fa96bbedece12
+SIZE (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.4/v0.8.4.mod) = 3638
+SHA256 (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.4/v0.8.4.zip) = f4a6f71ae6711e8307f4d1bb2a53e653b11ed3389c879597800a331db674fd39
+SIZE (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.4/v0.8.4.zip) = 605289
diff --git a/sysutils/zrepl-dsh2dsh/files/pkg-message.in b/sysutils/zrepl-dsh2dsh/files/pkg-message.in
index 92f9099f1f50..c8dc1af29cda 100644
--- a/sysutils/zrepl-dsh2dsh/files/pkg-message.in
+++ b/sysutils/zrepl-dsh2dsh/files/pkg-message.in
@@ -1,35 +1,38 @@
 [
 { type: install
   message: <<EOM
 Messages from sysutils/zrepl:
 
 SETUP BEFORE FIRST USE:
 - Create the log file /var/log/zrepl.log:
   # service newsyslog restart
 - Modify the %%PREFIX%%/etc/zrepl/zrepl.yml configuration file
+- Create ZFS datasets like:
+  # zfs create -o mountpoint=none -o readonly=on zdisk/zrepl
+  # zfs create zdisk/zrepl/localhost
 - Enable the zrepl daemon to start automatically at boot:
   # sysrc zrepl_enable="YES"
 - Start the zrepl daemon:
   # service zrepl start
 
 Documentation: https://github.com/dsh2dsh/zrepl?tab=readme-ov-file#changes-from-upstream
                https://zrepl.github.io/
 Changelog:     https://zrepl.github.io/master/changelog.html
 
 DANGER - SNAPSHOT PRUNING REQUIRES EXPLICIT KEEP RULES:
 For any ZFS snapshot that you want to keep, at least one rule must match.
 This also applies to snapshots taken by means other than zrepl
 (e.g. snapshots taken manually or via boot environment tools).
 
 In order to automatically warn the operator of impending certificate
 expiration, add this line to /etc/periodic.conf:
 
     weekly_zrepl_enable="YES"
 
 More config details in the zrepl periodic script:
 
     %%LOCALBASE%%/etc/periodic/weekly/500.zrepl
 
 EOM
 }
 ]
diff --git a/sysutils/zrepl-dsh2dsh/files/zrepl.daily.in b/sysutils/zrepl-dsh2dsh/files/zrepl.daily.in
new file mode 100644
index 000000000000..03b663264090
--- /dev/null
+++ b/sysutils/zrepl-dsh2dsh/files/zrepl.daily.in
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+if [ -r /etc/defaults/periodic.conf ]
+then
+    . /etc/defaults/periodic.conf
+    source_periodic_confs
+fi
+
+: "${daily_zrepl_enable=NO}"
+: "${daily_zrepl_warn=15m}"
+: "${daily_zrepl_crit=1h}"
+zrepl="%%PREFIX%%/bin/zrepl"
+
+case "$daily_zrepl_enable" in
+    [Yy][Ee][Ss])
+	      if service zrepl enabled; then
+            echo
+            echo "Check zrepl status:"
+            $zrepl monitor alive -w "$daily_zrepl_warn" -c "$daily_zrepl_crit"
+            $zrepl monitor snapshots
+	      fi
+	      ;;
+esac
+
+# assigned in periodic.conf
+# shellcheck disable=SC2086,SC2154
+exit $rc
diff --git a/sysutils/zrepl-dsh2dsh/files/zrepl.yml b/sysutils/zrepl-dsh2dsh/files/zrepl.yml
index 048f5d58b1a5..c52b4e016317 100644
--- a/sysutils/zrepl-dsh2dsh/files/zrepl.yml
+++ b/sysutils/zrepl-dsh2dsh/files/zrepl.yml
@@ -1,136 +1,151 @@
 # zrepl main configuration file. For documentation, refer to
 # https://zrepl.github.io/ and https://github.com/dsh2dsh/zrepl
 #
 global:
   # rpc_timeout: "1m"
   zfs_bin: "/sbin/zfs"
 
   logging:
     - type: "file"
       format: "text"            # or "json"
       time: false               # don't prepend with date and time
       hide_fields: &hide-log-fields
         - "span"                # don't log "span" field
       level:  "error"           # log errors only
       # without filename logs to stderr
     - type: "file"
       format: "text"
       hide_fields: *hide-log-fields
       level:  "info"
       filename: "/var/log/zrepl.log"
 
 # Add "jobs:" section(s) here for your specific use cases.
 jobs:
   - name: "hourly-snap"
     type: "snap"
     filesystems: &filesystems
       "zroot/ROOT/default<": true
       "zroot/usr/home<": true
     snapshotting:
       type: "periodic"
       interval: "1h"
       prefix: "zrepl_hourly_"
     pruning: &keep-all
 
   - name: "daily-snap"
     type: "snap"
     filesystems: *filesystems
     snapshotting:
       type: "periodic"
       interval: "1d"
       prefix: "zrepl_daily_"
     pruning: *keep-all
 
   - name: "monthly-snap"
     type: "snap"
     filesystems: *filesystems
     snapshotting:
       type: "periodic"
       interval: "30d"
       prefix: "zrepl_monthly_"
     pruning: *keep-all
 
   - name: "zdisk"
     type: "sink"
     root_fs: "zdisk/zrepl"
     serve:
       type: "local"
       listener_name: "zdisk"
     recv:
       placeholder:
         encryption: "inherit"
     monitor: &monitor-snapshots
+      count:
+        - prefix: "zrepl_frequently_"
+          warning: 18
+          critical: 30
+        - prefix: "zrepl_hourly_"
+          warning: 32
+          critical: 50
+        - prefix: "zrepl_daily_"
+          warning: 92
+          critical: 100
+        - prefix: "zrepl_monthly_"
+          warning: 14
+          critical: 15
+        - prefix: ""            # everything else
+          warning: 2
+          critical: 10
       latest:
         - prefix: "zrepl_frequently_"
           critical: "48h"       # 2d
         - prefix: "zrepl_hourly_"
           critical: "48h"
         - prefix: "zrepl_daily_"
           critical: "48h"
         - prefix: "zrepl_monthly_"
           critical: "768h"      # 32d
       oldest:
           # see zroot-to-zdisk prunner.keep_receiver
         - prefix: "zrepl_frequently_"
           critical: "48h"       # 2d
         - prefix: "zrepl_hourly_"
           critical: "168h"      # 7d
         - prefix: "zrepl_daily_"
           critical: "2208h"     # 90d + 2d
         - prefix: "zrepl_monthly_"
           critical: "8688h"     # 30 * 12 = 360d + 2d
         - prefix: ""            # everything else
           critical: "168h"      # 7d
 
   - name: "zroot-to-zdisk"
     type: "push"
     connect:
       type: "local"
       listener_name: "zdisk"
       client_identity: "localhost"
     filesystems: *filesystems
     replication: &replication
       # Send all intermediary snapshots as a stream package, instead of sending
       # them one by one.
       #one_step: true
       concurrency:
-        steps: 4
         size_estimates: 8
     conflict_resolution: &conflict_resolution
       initial_replication: "all"
     snapshotting:
       type: "periodic"
       cron: "*/15 * * * *"
       prefix: "zrepl_frequently_"
     pruning:
       keep_sender:
         - type: "not_replicated"
         - type: "last_n"
           count: 16
           regex: "^zrepl_frequently_"
         - type: "regex"
           negate: true
           regex: "^zrepl_"
         - type: "last_n"
           count: 8
           regex: "^zrepl_hourly_"
         - type: "last_n"
           count: 4
           regex: "^zrepl_daily_"
         - type: "last_n"
           count: 2
           regex: "^zrepl_monthly_"
       keep_receiver: &keep-receiver
         - type: "last_n"
           count: 2
           regex: "^zrepl_frequently_"
         - type: "last_n"
           count: 30
           regex: "^zrepl_hourly_"
         - type: "last_n"
           count: 90
           regex: "^zrepl_daily_"
         - type: "last_n"
           count: 12
           regex: "^zrepl_monthly_"
     monitor: *monitor-snapshots
diff --git a/sysutils/zrepl-dsh2dsh/pkg-plist b/sysutils/zrepl-dsh2dsh/pkg-plist
index 7f2c52e6e5f6..fcb072f2a996 100644
--- a/sysutils/zrepl-dsh2dsh/pkg-plist
+++ b/sysutils/zrepl-dsh2dsh/pkg-plist
@@ -1,22 +1,23 @@
 bin/zrepl
+etc/periodic/daily/zrepl
 etc/periodic/weekly/500.zrepl
 @sample %%ETCDIR%%/zrepl.yml.sample
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bandwidth_limit.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grafana-prometheus-zrepl.json
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hooks/template.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/local.yml
 @sample %%EXAMPLESDIR%%/newsyslog.conf etc/newsyslog.conf.d/zrepl.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pull.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pull_ssh.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/push.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/quickstart_backup_to_external_disk.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/quickstart_continuous_server_backup_receiver.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/quickstart_continuous_server_backup_sender.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/quickstart_fan_out_replication_source.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/quickstart_fan_out_replication_target.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sink.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/snap.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/snap_cron.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/source.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/source_ssh.yml
 @dir etc/newsyslog.conf.d