diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index aa4034a1da95..26b791634fcd 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -4,8 +4,6 @@
 PORTNAME=	keychain
 PORTVERSION=	2.8.5
 CATEGORIES=	security
-MASTER_SITES=	http://www.funtoo.org/archive/keychain/ \
-		GENTOO
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	User-friendly front-end to ssh-agent(1)
@@ -13,7 +11,9 @@ COMMENT=	User-friendly front-end to ssh-agent(1)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-USES=		tar:bzip2
+USE_GITHUB=	yes
+GH_ACCOUNT=	funtoo
+
 OPTIONS_DEFINE=	DOCS
 
 NO_BUILD=	yes
diff --git a/security/keychain/distinfo b/security/keychain/distinfo
index d02983ca0508..c191cee8cc7f 100644
--- a/security/keychain/distinfo
+++ b/security/keychain/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1528577567
-SHA256 (keychain-2.8.5.tar.bz2) = 16f5949b606691dea6e1832a77e697b8c0b2a536abfbd29e3a3f47222259c3b2
-SIZE (keychain-2.8.5.tar.bz2) = 34869
+TIMESTAMP = 1587517454
+SHA256 (funtoo-keychain-2.8.5_GH0.tar.gz) = dcce703e5001211c8ebc0528f45b523f84d2bceeb240600795b4d80cb8475a0b
+SIZE (funtoo-keychain-2.8.5_GH0.tar.gz) = 66446
diff --git a/security/keychain/pkg-descr b/security/keychain/pkg-descr
index 2a515a3c02b8..6414dff53a89 100644
--- a/security/keychain/pkg-descr
+++ b/security/keychain/pkg-descr
@@ -5,4 +5,4 @@ system rather than per login session.
 Please study the documentation on the keychain website carefully since
 incorrect usage of this script may have certain security implications.
 
-WWW: http://www.funtoo.org/index.php?title=Keychain
+WWW: https://www.funtoo.org/Keychain