diff --git a/net/rpki-client/Makefile b/net/rpki-client/Makefile
index 044f5deb9acd..48976d5ff357 100644
--- a/net/rpki-client/Makefile
+++ b/net/rpki-client/Makefile
@@ -1,34 +1,28 @@
 PORTNAME=	rpki-client
-DISTVERSION=	8.0
+DISTVERSION=	8.2
 CATEGORIES=	net
+MASTER_SITES=	https://cdn.openbsd.org/pub/OpenBSD/rpki-client/ \
+		https://cloudflare.cdn.openbsd.org/pub/OpenBSD/rpki-client/
 
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Resource Public Key Infrastructure (RPKI) implementation from OpenBSD
 WWW=		https://www.rpki-client.org/
 
 LICENSE=	ISCL
 
 BUILD_DEPENDS=	rsync>0:net/rsync
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libtls.so:security/libretls
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
 		rsync>0:net/rsync
 
 USES=		autoreconf libtool pkgconfig ssl
 
-USE_GITHUB=	yes
-GH_PROJECT=	${PORTNAME}-portable ${PORTNAME}-openbsd:openbsd
-GH_SUBDIR=	openbsd:openbsd
-GH_TAGNAME=	${PORTNAME}-${DISTVERSION}:openbsd
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libtls=libtls
 
 USERS=		_rpki-client
 GROUPS=		${USERS}
 PLIST_SUB=	USERS="${USERS}"
 
-pre-configure:
-	cd ${WRKSRC} && ${SH} update.sh
-
 .include <bsd.port.mk>
diff --git a/net/rpki-client/distinfo b/net/rpki-client/distinfo
index f239a8c933a0..520ea18dd580 100644
--- a/net/rpki-client/distinfo
+++ b/net/rpki-client/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1663493813
-SHA256 (rpki-client-rpki-client-portable-8.0_GH0.tar.gz) = 38a248b7bc479b58f6df36f69cd9bea3b307a99bb583546159d08937209e6fab
-SIZE (rpki-client-rpki-client-portable-8.0_GH0.tar.gz) = 56547
-SHA256 (rpki-client-rpki-client-openbsd-rpki-client-8.0_GH0.tar.gz) = abae21232d53c8946feb74b4c055e89afe47bae3c5d9006dba8d845659032476
-SIZE (rpki-client-rpki-client-openbsd-rpki-client-8.0_GH0.tar.gz) = 655702
+TIMESTAMP = 1671092898
+SHA256 (rpki-client-8.2.tar.gz) = dc0d19679b57ae657b92d21730b1678823974d43300faa8c24ee155c1e2b1d64
+SIZE (rpki-client-8.2.tar.gz) = 475141