diff --git a/UPDATING b/UPDATING
index 33b97a3abad5..8ec28efe0e02 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,17 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20241115
+  AFFECTS: users of filesystems/zrepl-dsh2dsh
+  AUTHOR: dsh@bamus.cz
+
+  Users upgrading from before 0.9.0 need to modify configuration file:
+
+      %%PREFIX%%/etc/zrepl/zrepl.yml
+
+  Please read more about this change here:
+  https://github.com/dsh2dsh/zrepl?tab=readme-ov-file#breaking-changes
+
 20241112
   AFFECTS: users of databases/prometheus-postgres-exporter
   AUTHOR: lexi@hemlock.eden.le-fay.org
diff --git a/filesystems/zrepl-dsh2dsh/Makefile b/filesystems/zrepl-dsh2dsh/Makefile
index 71a0b73a1f28..89227845ed7b 100644
--- a/filesystems/zrepl-dsh2dsh/Makefile
+++ b/filesystems/zrepl-dsh2dsh/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	zrepl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.9
-PORTREVISION=	1
+DISTVERSION=	0.9.1
 CATEGORIES=	filesystems sysutils
 PKGNAMESUFFIX=	-dsh2dsh
 
@@ -42,6 +41,9 @@ post-install:
 	${INSTALL_DATA} \
 		${WRKSRC}/dist/freebsd/etc/newsyslog.conf.d/${PORTNAME}.conf \
 		${STAGEDIR}${EXAMPLESDIR}/newsyslog.conf
+	${INSTALL_DATA} \
+		${WRKSRC}/dist/freebsd/etc/${PORTNAME}/keys.yaml \
+		${STAGEDIR}${ETCDIR}/keys.yaml.sample
 	${INSTALL_DATA} ${WRKSRC}/dist/freebsd/etc/${PORTNAME}/${PORTNAME}.yml \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}.yml.sample
 	${INSTALL_SCRIPT} \
diff --git a/filesystems/zrepl-dsh2dsh/distinfo b/filesystems/zrepl-dsh2dsh/distinfo
index e9dad4f55f89..b44e30ac6598 100644
--- a/filesystems/zrepl-dsh2dsh/distinfo
+++ b/filesystems/zrepl-dsh2dsh/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1730976228
-SHA256 (go/filesystems_zrepl-dsh2dsh/zrepl-v0.8.9/v0.8.9.mod) = b1328a874b06ec042040304ef051aed69ba12d870b69789e77f3db456cf99946
-SIZE (go/filesystems_zrepl-dsh2dsh/zrepl-v0.8.9/v0.8.9.mod) = 3490
-SHA256 (go/filesystems_zrepl-dsh2dsh/zrepl-v0.8.9/v0.8.9.zip) = f0dbf0e40feb60e811dc46505eb9df0de82afe3b354c0d0d44945fcfb0dc49c8
-SIZE (go/filesystems_zrepl-dsh2dsh/zrepl-v0.8.9/v0.8.9.zip) = 600710
+TIMESTAMP = 1731682710
+SHA256 (go/filesystems_zrepl-dsh2dsh/zrepl-v0.9.1/v0.9.1.mod) = a8d3059967aca09a00467488edca138c35b232d3cb300d496e25044498ee9eeb
+SIZE (go/filesystems_zrepl-dsh2dsh/zrepl-v0.9.1/v0.9.1.mod) = 2881
+SHA256 (go/filesystems_zrepl-dsh2dsh/zrepl-v0.9.1/v0.9.1.zip) = 396a1c3aa2c26419b3027dbb041fe6e646ee5614efcae6a0152321b06a2c27e5
+SIZE (go/filesystems_zrepl-dsh2dsh/zrepl-v0.9.1/v0.9.1.zip) = 447170
diff --git a/filesystems/zrepl-dsh2dsh/files/pkg-message.in b/filesystems/zrepl-dsh2dsh/files/pkg-message.in
index 288cad6b2a1e..2a6b7acc61b9 100644
--- a/filesystems/zrepl-dsh2dsh/files/pkg-message.in
+++ b/filesystems/zrepl-dsh2dsh/files/pkg-message.in
@@ -1,8 +1,6 @@
 [
 { type: install
   message: <<EOM
-Messages from filesystems/zrepl-dsh2dsh:
-
 SETUP BEFORE FIRST USE:
 - Create the log file /var/log/zrepl.log:
   # service newsyslog restart
@@ -38,6 +36,18 @@ More config details in the zrepl periodic script:
 
     %%LOCALBASE%%/etc/periodic/weekly/500.zrepl
 
+EOM
+}
+{
+  type: upgrade
+  maximum_version: "0.9.0"
+  message: <<EOM
+Upgrading from before 0.9.0 need to modify configuration file:
+
+  %%PREFIX%%/etc/zrepl/zrepl.yml
+
+Please read more about this change here:
+https://github.com/dsh2dsh/zrepl?tab=readme-ov-file#breaking-changes
 EOM
 }
 ]
diff --git a/filesystems/zrepl-dsh2dsh/pkg-plist b/filesystems/zrepl-dsh2dsh/pkg-plist
index 3e2aac89ae3b..3000937e9aa5 100644
--- a/filesystems/zrepl-dsh2dsh/pkg-plist
+++ b/filesystems/zrepl-dsh2dsh/pkg-plist
@@ -2,14 +2,15 @@ bin/zrepl
 etc/periodic/daily/zrepl
 etc/periodic/weekly/500.zrepl
 etc/rc.d/zrepl
+@sample(,,0600) %%ETCDIR%%/keys.yaml.sample
 @sample %%ETCDIR%%/zrepl.yml.sample
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bandwidth_limit.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grafana-prometheus-zrepl.json
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hooks/template.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/keys.yaml
 %%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
@@ -20,5 +21,4 @@ etc/rc.d/zrepl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/snap.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/snap_cron.yml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/source.yml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/source_ssh.yml
 @dir etc/newsyslog.conf.d