diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index c116375d5bf6..913a8fbc38f1 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	keychain
-PORTVERSION=	2.8.5
-PORTREVISION=	1
+PORTVERSION=	2.9.5
 CATEGORIES=	security
 
 MAINTAINER=	garga@FreeBSD.org
@@ -10,24 +9,24 @@ WWW=		https://www.funtoo.org/Keychain
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	funtoo
-
-CONFLICTS_INSTALL=	py*-pycoin # bin/keychain
-
-OPTIONS_DEFINE=	DOCS
-
-NO_BUILD=	yes
-
-PLIST_FILES=	bin/${PORTNAME} \
-		share/man/man1/keychain.1.gz
-
-PORTDOCS=	ChangeLog README.md
-
 .if !exists(${LOCALBASE}/bin/ssh-agent) && !exists(/usr/bin/ssh-agent)
 RUN_DEPENDS+=	ssh-agent:security/openssh-portable
 .endif
 
+USES=		perl5
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	funtoo
+USE_PERL5=	build
+
+CONFLICTS_INSTALL=	py*-pycoin # bin/keychain
+
+PLIST_FILES=	bin/${PORTNAME} \
+		share/man/man1/keychain.1.gz
+PORTDOCS=	ChangeLog.md README.md
+
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/keychain.1 ${STAGEDIR}${PREFIX}/share/man/man1
diff --git a/security/keychain/distinfo b/security/keychain/distinfo
index c191cee8cc7f..5dfacbe82b18 100644
--- a/security/keychain/distinfo
+++ b/security/keychain/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587517454
-SHA256 (funtoo-keychain-2.8.5_GH0.tar.gz) = dcce703e5001211c8ebc0528f45b523f84d2bceeb240600795b4d80cb8475a0b
-SIZE (funtoo-keychain-2.8.5_GH0.tar.gz) = 66446
+TIMESTAMP = 1750426458
+SHA256 (funtoo-keychain-2.9.5_GH0.tar.gz) = c883f26db616bc1c81ba5ef3832c7ad912f3e8bd0baf6aaff981164c538a1411
+SIZE (funtoo-keychain-2.9.5_GH0.tar.gz) = 42685