diff --git a/net-misc/rpki-client/Manifest b/net-misc/rpki-client/Manifest
index 8995a8f..279f07e 100644
--- a/net-misc/rpki-client/Manifest
+++ b/net-misc/rpki-client/Manifest
@@ -1,4 +1,5 @@
-DIST rpki-client-6.7_p1.tar.gz 44463 BLAKE2B c269a502c680a4c41c2201fceed2f3bab7b83e3a6a173fea5081ced073e10f02fd7aaa07ef4b9d14f816c88871ffee8c65126f0efcda9e8ca7c08032cac179d6 SHA512 bc9815ab6cd930715e9494b82b1547a419706db3fa4eca003767d6e39c3a63c0a3f3048c211c773e1f0e87043b0bfd622b0d5be856ccced27f893eefc9511211
 DIST rpki-client-6.8p1.tar.gz 390248 BLAKE2B f7d553cd1291ea803bf17da31a57ca940cfec4915cff1d504b3665b4c84e809bc2a20e5241d76589594426420903548fde4f1967526ae1e047661a03b948dd94 SHA512 41f6374e600b9411c70e6b5748ad4f06d779a47c25005111a72c28b2eeb941ea7ceaaced19c7f2917f62e4f595a951c7bfcbbc85288610501306a26454deb872
 DIST rpki-client-7.0-cert.pem 335615 BLAKE2B 9848b986b8b3fe1cbea880fa3161d9292aaf3ec5e2d6668b422ec840c5055a4fed1d3f4c78bff07b7fc75fe6642de95c3ccb3c2e8ab2f34ef37c27883c7578db SHA512 80f59079cfe66734543d19347734ae82d18219184cf264cef620a867cf171258272ca4504afad65600800e5a8025fd5b686220a03fffedd402f715fca405fc41
 DIST rpki-client-7.0.tar.gz 430661 BLAKE2B bbc801f3369294de4f6f7c4d0365b9da87494e868aa47832ced79945f49959e5c02cf8d8f0b78050faffa2b880c48d019fb00a410d8cb1fa85728d81efd491c3 SHA512 40a23207e79ab6995f08d25beadf9035a9acde38ec56e6b90f7ee7ab337e318d6dc2a6f954e83f9239fddc83b331ceea7615269b1ff7ae85dd5aec101b402412
+DIST rpki-client-7.1-cert.pem 335615 BLAKE2B 9848b986b8b3fe1cbea880fa3161d9292aaf3ec5e2d6668b422ec840c5055a4fed1d3f4c78bff07b7fc75fe6642de95c3ccb3c2e8ab2f34ef37c27883c7578db SHA512 80f59079cfe66734543d19347734ae82d18219184cf264cef620a867cf171258272ca4504afad65600800e5a8025fd5b686220a03fffedd402f715fca405fc41
+DIST rpki-client-7.1.tar.gz 433661 BLAKE2B f0179c9e6fda70a601570add6cc1d5386cfab26bc826d6b75b9ff3c4cec2eace7e28bfaeab522fce7e985bbdfb0cf8f5871105d584f29b60f88bcc1f553d01bf SHA512 51feb3cc9a47db2ca2ef2510b52771703c074461683bfc525dea3a3a8579e5d51d54f09a0b3299e52524cfc7a886a2a495fc2d00ba1e48330cff2e712214e6f2
diff --git a/net-misc/rpki-client/rpki-client-6.7_p1.ebuild b/net-misc/rpki-client/rpki-client-7.1.ebuild
similarity index 57%
rename from net-misc/rpki-client/rpki-client-6.7_p1.ebuild
rename to net-misc/rpki-client/rpki-client-7.1.ebuild
index b9a0673..ab0e569 100644
--- a/net-misc/rpki-client/rpki-client-6.7_p1.ebuild
+++ b/net-misc/rpki-client/rpki-client-7.1.ebuild
@@ -1,18 +1,15 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools git-r3
-
-MY_PN="${PN}-portable"
 MY_PV="${PV/_p/p}"
-MY_P="${MY_PN}-${MY_PV}"
+MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Portability shim for OpenBSD's rpki-client"
 HOMEPAGE="https://rpki-client.org/"
-SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}-openbsd.git"
+SRC_URI="mirror://openbsd/${PN}/${PN}-${MY_PV}.tar.gz
+https://lg.breizh-ix.net/ssl/cert.pem -> ${PN}-${MY_PV}-cert.pem"
 
 LICENSE="ISC"
 SLOT="0"
@@ -22,34 +19,14 @@ IUSE=""
 DEPEND="
 	acct-group/_rpki-client
 	acct-user/_rpki-client
+	dev-libs/libretls
 "
 RDEPEND="${DEPEND}"
-BDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-${PV%_*}-update.patch"
-)
+BDEPEND="
+	sys-devel/libtool
+"
 
 S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	default
-
-	EGIT_BRANCH=$(cat "${S}"/OPENBSD_BRANCH)
-	EGIT_CHECKOUT_DIR="${S}/openbsd"
-	git-r3_fetch
-	git-r3_checkout
-}
-
-src_prepare() {
-	default
-
-	cd "${S}"
-	./autogen.sh
-
-	eautoreconf
-}
-
 src_configure() {
 	local myeconfargs=(
 		--with-rsync=rsync
@@ -61,8 +38,12 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" BINDIR="/usr/bin" MANDIR="/usr/share/man" install
+
 	insinto /etc/rpki
 	doins *.tal
 	keepdir "/var/db/${PN}/"
 	fowners -R _rpki-client "/var/db/${PN}/"
+
+	insinto /etc/ssl
+	newins "${DISTDIR}/${PN}-${MY_PV}-cert.pem" cert.pem
 }