diff --git a/sysutils/sanoid-devel/Makefile b/sysutils/sanoid-devel/Makefile
index 4c57f98a7d32..915b798ca8ff 100644
--- a/sysutils/sanoid-devel/Makefile
+++ b/sysutils/sanoid-devel/Makefile
@@ -1,53 +1,55 @@
 PORTNAME=	sanoid
-PORTVERSION=	1.0.0.20191105
-PORTREVISION=	0
+DISTVERSION=	2.1.0-20230428
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	hartzell@alerce.com
 COMMENT=	Policy-driven snapshot management and replication tools
 WWW=		https://github.com/jimsalterjrs/sanoid
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	lzop:archivers/lzop \
 		mbuffer:misc/mbuffer \
 		pv:sysutils/pv \
 		p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
 		p5-Config-IniFiles>=0:devel/p5-Config-IniFiles
 
 USES=		shebangfix perl5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jimsalterjrs
-GH_TAGNAME=	45d0898
+GH_TAGNAME=	55c5e0e
 
 USE_PERL5=	run
 SHEBANG_FILES=	findoid sanoid sleepymutex syncoid
 
 CONFLICTS_INSTALL=	sanoid # bin/findoid
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 # line 19:  my %args = ("configdir" => "/etc/sanoid");
 post-patch:
 	@${REINPLACE_CMD} -i '' -e 's|/etc/sanoid|${PREFIX}/etc/sanoid|' \
 		${WRKSRC}/sanoid
 	@${REINPLACE_CMD} -i '' \
-		-e 's|:/bin:/usr/bin:/sbin|:${PREFIX}/bin:/bin:/usr/bin:/sbin|' \
+		-e 's|/usr/bin/lzop|${LOCALBASE}/bin/lzop|' \
+		-e 's|/usr/bin/mbuffer|${LOCALBASE}/bin/mbuffer|' \
+		-e 's|/usr/bin/pv|${LOCALBASE}/bin/pv|' \
+		-e 's|/usr/bin/sudo|${LOCALBASE}/bin/sudo|' \
 		${WRKSRC}/syncoid
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/findoid ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/sanoid ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/sleepymutex ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/syncoid ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}/${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/sanoid.defaults.conf \
 		${STAGEDIR}${ETCDIR}/sanoid.defaults.conf
 	${INSTALL_DATA} ${WRKSRC}/sanoid.conf \
 		${STAGEDIR}${ETCDIR}/sanoid.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/sanoid-devel/distinfo b/sysutils/sanoid-devel/distinfo
index 6016946177ea..3fb8a94a93c1 100644
--- a/sysutils/sanoid-devel/distinfo
+++ b/sysutils/sanoid-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573002145
-SHA256 (jimsalterjrs-sanoid-1.0.0.20191105-45d0898_GH0.tar.gz) = 7c34080632e54814b01bcb9cc52247f0a1f5dfdc68daf07e397291fa47743c5e
-SIZE (jimsalterjrs-sanoid-1.0.0.20191105-45d0898_GH0.tar.gz) = 116208
+TIMESTAMP = 1683094701
+SHA256 (jimsalterjrs-sanoid-2.1.0-20230428-55c5e0e_GH0.tar.gz) = b31601ae66b67d2b8db369ebf88af60e97ea7132079dbd2c67fa2bcf604c1c2d
+SIZE (jimsalterjrs-sanoid-2.1.0-20230428-55c5e0e_GH0.tar.gz) = 76222
diff --git a/sysutils/sanoid-devel/pkg-message b/sysutils/sanoid-devel/pkg-message
index 5cd683df484c..d1235e3cb75d 100644
--- a/sysutils/sanoid-devel/pkg-message
+++ b/sysutils/sanoid-devel/pkg-message
@@ -1,16 +1,16 @@
 [
 {
   type: install
   message: <<EOD
 
- Sanoid requires additional configuration in the ${PREFIX}/etc/sanoid/sanoid.conf 
+ Sanoid requires additional configuration in the ${PREFIX}/etc/sanoid/sanoid.conf
  file.
 
  A sample has been installed in ${PREFIX}/etc/sanoid/sanoid.conf.sample and
  additional documentation can be found at the sanoid master site:
- 
+
    https://github.com/jimsalterjrs/sanoid
 
 EOD
 }
 ]