diff --git a/net/sakisafecli/Makefile b/net/sakisafecli/Makefile
index 221aafe0d5b3..53d16b9f4787 100644
--- a/net/sakisafecli/Makefile
+++ b/net/sakisafecli/Makefile
@@ -1,25 +1,32 @@
 PORTNAME=	sakisafe
-DISTVERSION=	2.2.1
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.5.1
 CATEGORIES=	net
-MASTER_SITES=	http://git.qorg11.net/sakisafe.git/snapshot/
 
 MAINTAINER=	teru-sama@riseup.net
 COMMENT=	Client for many file-sharing websites
+WWW=		https://github.com/rfc-2549/sakisafe
 
-LICENSE=	GPLv3
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libconfig.so:devel/libconfig \
 		libcurl.so:ftp/curl \
 		libnghttp2.so:www/libnghttp2
 
 USES=		localbase ssl
+USE_GITHUB=	yes
+GH_ACCOUNT=	rfc-2549
 
 CFLAGS+=	-fPIC
 
+PLIST_FILES=	bin/sakisafecli \
+		share/man/man1/sakisafecli.1.gz \
+		share/man/man5/sakisafeclirc.5.gz
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sakisafecli/sakisafecli ${STAGEDIR}${PREFIX}/bin/sakisafecli
 	${INSTALL_MAN} ${WRKSRC}/sakisafecli/sakisafecli.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_MAN} ${WRKSRC}/sakisafecli/sakisafeclirc.5 ${STAGEDIR}${PREFIX}/share/man/man5
 
 .include <bsd.port.mk>
diff --git a/net/sakisafecli/distinfo b/net/sakisafecli/distinfo
index 54cb480e7ef6..db89ac7679f5 100644
--- a/net/sakisafecli/distinfo
+++ b/net/sakisafecli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656165354
-SHA256 (sakisafe-2.2.1.tar.gz) = 84aefdb9ef43a1002d4e4def548ca2c33c2f15920a20de11ede9b5d1310a18dc
-SIZE (sakisafe-2.2.1.tar.gz) = 131611
+TIMESTAMP = 1727962239
+SHA256 (rfc-2549-sakisafe-v2.5.1_GH0.tar.gz) = fb833b1200e6ae24e5776c7c32097b4163f92a2b6f43ff2def1dff712c901a3f
+SIZE (rfc-2549-sakisafe-v2.5.1_GH0.tar.gz) = 122374
diff --git a/net/sakisafecli/pkg-plist b/net/sakisafecli/pkg-plist
deleted file mode 100644
index 36e0e6693ace..000000000000
--- a/net/sakisafecli/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/sakisafecli
-share/man/man1/sakisafecli.1.gz
-share/man/man5/sakisafeclirc.5.gz