diff --git a/security/ssh-tools/Makefile b/security/ssh-tools/Makefile
index bb01dfca8ab6..b28a44c2ab7b 100644
--- a/security/ssh-tools/Makefile
+++ b/security/ssh-tools/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	ssh-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7
-PORTREVISION=	1
+DISTVERSION=	1.9
 CATEGORIES=	security
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
-PATCHFILES=	0bf5771fe3fafcb60ebf4541b8d382eb0ec9f7bc.patch:-p1
+MASTER_SITES=	https://codeberg.org/vaporup/ssh-tools/archive/
+DISTNAME=	${DISTVERSIONFULL}
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	CLI tools that make SSH more convenient
-WWW=		https://github.com/vaporup/ssh-tools
+WWW=		https://codeberg.org/vaporup/ssh-tools
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		perl5 shebangfix
-USE_GITHUB=	yes
-GH_ACCOUNT=	vaporup
 USE_PERL5=	run
-SHEBANG_FILES=	ssh-*
+SHEBANG_GLOB=	ssh-*
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/ssh-* ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/cmd/bash/*/ssh-* ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/security/ssh-tools/distinfo b/security/ssh-tools/distinfo
index a814e7c87002..bcf62aafe74e 100644
--- a/security/ssh-tools/distinfo
+++ b/security/ssh-tools/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1645366225
-SHA256 (vaporup-ssh-tools-v1.7_GH0.tar.gz) = c96dd7d4630dff0afdce597e0d254abc2a5ae87d3c3ba6e83af952713db6c961
-SIZE (vaporup-ssh-tools-v1.7_GH0.tar.gz) = 29213
-SHA256 (0bf5771fe3fafcb60ebf4541b8d382eb0ec9f7bc.patch) = ac46e1f37073ec52ca58655437343821bf846f7583b1965cb982fd7ed047fc87
-SIZE (0bf5771fe3fafcb60ebf4541b8d382eb0ec9f7bc.patch) = 757
+TIMESTAMP = 1789652573
+SHA256 (ssh-tools/v1.9.tar.gz) = 0549464f557e5d0d9eac4b88c2a039d81fae0ef786a1cdfb1f08b8929b8b6199
+SIZE (ssh-tools/v1.9.tar.gz) = 812027
diff --git a/security/ssh-tools/pkg-plist b/security/ssh-tools/pkg-plist
index 3713eb392c23..c4f7fae9e2be 100644
--- a/security/ssh-tools/pkg-plist
+++ b/security/ssh-tools/pkg-plist
@@ -1,8 +1,9 @@
 bin/ssh-certinfo
 bin/ssh-diff
 bin/ssh-facts
 bin/ssh-force-password
 bin/ssh-hostkeys
 bin/ssh-keyinfo
 bin/ssh-ping
+bin/ssh-pwd
 bin/ssh-version