diff --git a/devel/github-backup-utils/Makefile b/devel/github-backup-utils/Makefile
index 06841b4dc7a7..668f0338a63c 100644
--- a/devel/github-backup-utils/Makefile
+++ b/devel/github-backup-utils/Makefile
@@ -1,36 +1,35 @@
 PORTNAME=	github-backup-utils
-PORTVERSION=	3.5.0
-PORTREVISION=	1
+PORTVERSION=	3.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/github/backup-utils/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	GitHub Enterprise Backup Utilities
 WWW=		https://github.com/github/backup-utils
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	bash:shells/bash \
 		git:devel/git \
 		rsync:net/rsync
 
 USES=		shebangfix
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 
 SHEBANG_FILES=	bin/* share/github-backup-utils/*
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/github-backup-utils/backup.config|${PREFIX}/etc/github.backup.config|g' ${WRKSRC}/share/github-backup-utils/ghe-backup-config
 
 do-install:
-	(cd ${WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/bin)
+	cd ${WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/backup.config-example ${STAGEDIR}${PREFIX}/etc/github.backup.config.sample
-	(cd ${WRKSRC}/share/github-backup-utils && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR})
+	cd ${WRKSRC}/share/github-backup-utils && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/devel/github-backup-utils/distinfo b/devel/github-backup-utils/distinfo
index 055891c5bc7a..bce1a19756ec 100644
--- a/devel/github-backup-utils/distinfo
+++ b/devel/github-backup-utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1654774054
-SHA256 (github-backup-utils-v3.5.0.tar.gz) = 5aa8ba7c81d337fa31479bd9a7c61bf7f98fe318ed5d29a98bd97942c689adc5
-SIZE (github-backup-utils-v3.5.0.tar.gz) = 116692
+TIMESTAMP = 1684104310
+SHA256 (github-backup-utils-v3.8.0.tar.gz) = 684b0fd2a7996cd55311463e3d7eb4dcbf544edff6e90ec1fba7a371b1dcea6b
+SIZE (github-backup-utils-v3.8.0.tar.gz) = 116682
diff --git a/devel/github-backup-utils/pkg-plist b/devel/github-backup-utils/pkg-plist
index ea32eeb945de..b5811a6bb422 100644
--- a/devel/github-backup-utils/pkg-plist
+++ b/devel/github-backup-utils/pkg-plist
@@ -1,55 +1,55 @@
 bin/ghe-backup
 bin/ghe-host-check
 bin/ghe-restore
 @sample etc/github.backup.config.sample
 %%DATADIR%%/bm.sh
 %%DATADIR%%/ghe-backup-actions
 %%DATADIR%%/ghe-backup-config
 %%DATADIR%%/ghe-backup-config.bak
 %%DATADIR%%/ghe-backup-es-audit-log
 %%DATADIR%%/ghe-backup-es-rsync
 %%DATADIR%%/ghe-backup-fsck
 %%DATADIR%%/ghe-backup-git-hooks
 %%DATADIR%%/ghe-backup-minio
 %%DATADIR%%/ghe-backup-mssql
 %%DATADIR%%/ghe-backup-mysql
 %%DATADIR%%/ghe-backup-mysql-binary
 %%DATADIR%%/ghe-backup-mysql-logical
 %%DATADIR%%/ghe-backup-pages
 %%DATADIR%%/ghe-backup-redis
 %%DATADIR%%/ghe-backup-repositories
 %%DATADIR%%/ghe-backup-settings
 %%DATADIR%%/ghe-backup-storage
 %%DATADIR%%/ghe-backup-store-version
 %%DATADIR%%/ghe-backup-strategy
 %%DATADIR%%/ghe-backup-userdata
-%%DATADIR%%/ghe-cluster-nodes
+%%DATADIR%%/ghe-cluster-find-nodes
 %%DATADIR%%/ghe-detect-leaked-ssh-keys
 %%DATADIR%%/ghe-docker-init
 %%DATADIR%%/ghe-gc-disable
 %%DATADIR%%/ghe-gc-enable
 %%DATADIR%%/ghe-maintenance-mode-status
 %%DATADIR%%/ghe-prune-snapshots
 %%DATADIR%%/ghe-restore-actions
 %%DATADIR%%/ghe-restore-es-audit-log
 %%DATADIR%%/ghe-restore-es-rsync
 %%DATADIR%%/ghe-restore-external-database-compatibility-check
 %%DATADIR%%/ghe-restore-git-hooks
 %%DATADIR%%/ghe-restore-minio
 %%DATADIR%%/ghe-restore-mssql
 %%DATADIR%%/ghe-restore-mysql
 %%DATADIR%%/ghe-restore-mysql-binary
 %%DATADIR%%/ghe-restore-mysql-legacy
 %%DATADIR%%/ghe-restore-mysql-logical
 %%DATADIR%%/ghe-restore-packages
 %%DATADIR%%/ghe-restore-pages
 %%DATADIR%%/ghe-restore-repositories
 %%DATADIR%%/ghe-restore-repositories-gist
 %%DATADIR%%/ghe-restore-settings
 %%DATADIR%%/ghe-restore-snapshot-path
 %%DATADIR%%/ghe-restore-storage
 %%DATADIR%%/ghe-rsync
 %%DATADIR%%/ghe-ssh
 %%DATADIR%%/ghe-ssh-config
 %%DATADIR%%/ghe-ssh-leaked-host-keys-list.txt
 %%DATADIR%%/version