diff --git a/media-sound/sndio/sndio-1.6.0.ebuild b/media-sound/sndio/sndio-1.6.0.ebuild
index 02deebf49c..d3338773e3 100644
--- a/media-sound/sndio/sndio-1.6.0.ebuild
+++ b/media-sound/sndio/sndio-1.6.0.ebuild
@@ -37,7 +37,7 @@ multilib_src_configure() {
 }
 
 src_install() {
-	multilib_src_install
+	multilib-minimal_src_install
 
 	doinitd "${FILESDIR}/sndiod"
 }
diff --git a/net-misc/openbgpd/Manifest b/net-misc/openbgpd/Manifest
index 5d2486dc3c..5e4abe2908 100644
--- a/net-misc/openbgpd/Manifest
+++ b/net-misc/openbgpd/Manifest
@@ -1 +1,2 @@
 DIST openbgpd-6.6p0.tar.gz 676732 BLAKE2B 80b391ead81d8d3bd20fe9b3eb3f8976485d29241f30c7395c678ff3f0fd87b2f3036b2ebb502ff0ca27d79f4fbbe6ba93576069edb32f004705d71d92e2b3a2 SHA512 07a7599b3ab14181575dc38647b307a4efa7d5dfa8a7aefe70483eb6773cb792eac788a10ea865d78daa59f197fc2d9cd2ce96d0c0251564507963716057fee0
+DIST openbgpd-6.7p0.tar.gz 699211 BLAKE2B 981105c3a9ba6a7b143ad6d926459382686f23b6355392fedaecaaf572c0d6054f6ce7656eaf7461d5bdc753e0be3d70f7ae44ee85395fd0d310d2bef7251bf8 SHA512 7309fe00ada74503ae6c739886e8a78af6cba93cbe6d29f9656eb95f96124401ac7b00ebe1b345b1c786582f661c72caf22c9193968662db2a1f19703f34cd2e
diff --git a/net-misc/openbgpd/files/openbgpd-9999-config.c.patch b/net-misc/openbgpd/files/openbgpd-9999-config.c.patch
index a4bda1270c..edda6fba07 100644
--- a/net-misc/openbgpd/files/openbgpd-9999-config.c.patch
+++ b/net-misc/openbgpd/files/openbgpd-9999-config.c.patch
@@ -1,5 +1,5 @@
---- openbsd/src/usr.sbin/bgpd/config.c	2020-03-20 17:55:04.089577745 +0100
-+++ openbsd/src/usr.sbin/bgpd/config.c	2020-03-20 17:56:01.480205070 +0100
+--- a/openbsd/src/usr.sbin/bgpd/config.c	2020-03-20 17:55:04.089577745 +0100
++++ b/openbsd/src/usr.sbin/bgpd/config.c	2020-03-20 17:56:01.480205070 +0100
 @@ -343,7 +343,8 @@
  		fatal("getifaddrs");
  
diff --git a/net-misc/openbgpd/files/openbgpd-9999-update.patch b/net-misc/openbgpd/files/openbgpd-9999-update.patch
index a60752d74f..15969c06a9 100644
--- a/net-misc/openbgpd/files/openbgpd-9999-update.patch
+++ b/net-misc/openbgpd/files/openbgpd-9999-update.patch
@@ -1,5 +1,5 @@
---- update.sh	2020-03-20 15:14:46.462983445 +0100
-+++ update.sh	2020-03-20 15:14:56.473090379 +0100
+--- a/update.sh	2020-03-20 15:14:46.462983445 +0100
++++ b/update.sh	2020-03-20 15:14:56.473090379 +0100
 @@ -13,10 +13,6 @@
  		git clone "${OPENBGPD_GIT}/openbsd"
  	fi
diff --git a/net-misc/openbgpd/openbgpd-6.6_p0.ebuild b/net-misc/openbgpd/openbgpd-6.6_p0.ebuild
index 2dd151e2ba..c4b1f50e34 100644
--- a/net-misc/openbgpd/openbgpd-6.6_p0.ebuild
+++ b/net-misc/openbgpd/openbgpd-6.6_p0.ebuild
@@ -20,6 +20,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	${DEPEND}
+	!!net-misc/quagga
 	acct-group/_bgpd
 	acct-user/_bgpd
 "
@@ -42,8 +43,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn ""
-	ewarn "OpenBGPD portable (not running on OpenBSD) can’t export its RIB to"
-	ewarn "the FIB. It’s only suitable for route-reflectors or route-servers."
-	ewarn ""
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		ewarn ""
+		ewarn "OpenBGPD portable (not running on OpenBSD) can’t export its RIB"
+		ewarn "to the FIB. It’s only suitable for route-reflectors or"
+		ewarn "route-servers."
+		ewarn ""
+	fi
 }
diff --git a/net-misc/openbgpd/openbgpd-6.7_p0.ebuild b/net-misc/openbgpd/openbgpd-6.7_p0.ebuild
new file mode 100644
index 0000000000..ccd7a6baf9
--- /dev/null
+++ b/net-misc/openbgpd/openbgpd-6.7_p0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="OpenBGPD is a free implementation of BGPv4"
+HOMEPAGE="http://www.openbgpd.org/index.html"
+SRC_URI="mirror://openbsd/OpenBGPD/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	!!net-misc/quagga
+	acct-group/_bgpd
+	acct-user/_bgpd
+"
+BDEPEND="
+	sys-devel/libtool
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}-init.d" bgpd
+	newconfd "${FILESDIR}/${PN}-conf.d" bgpd
+	systemd_newunit "${FILESDIR}/${PN}.service" bgpd.service
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		ewarn ""
+		ewarn "OpenBGPD portable (not running on OpenBSD) can’t export its RIB"
+		ewarn "to the FIB. It’s only suitable for route-reflectors or"
+		ewarn "route-servers."
+		ewarn ""
+	fi
+}
diff --git a/net-misc/openbgpd/openbgpd-9999.ebuild b/net-misc/openbgpd/openbgpd-9999.ebuild
index a7ba28443a..53a836bd2e 100644
--- a/net-misc/openbgpd/openbgpd-9999.ebuild
+++ b/net-misc/openbgpd/openbgpd-9999.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit autotools git-r3 systemd
 
 DESCRIPTION="OpenBGPD is a free implementation of BGPv4"
-HOMEPAGE="http://www.openbgpd.org/index.html"
-EGIT_REPO_URI="https://github.com/openbgpd-portable/openbgpd-portable.git"
+HOMEPAGE="http://www.openbgpd.org/"
+EGIT_REPO_URI="https://github.com/${PN}-portable/${PN}-portable.git"
 
 LICENSE="ISC"
 SLOT="0"
@@ -23,11 +23,14 @@ RDEPEND="
 "
 BDEPEND="
 	dev-util/byacc
-	sys-devel/autoconf
-	sys-devel/automake
 	sys-devel/libtool
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-update.patch"
+	"${FILESDIR}/${P}-config.c.patch"
+)
+
 src_unpack() {
 	git-r3_src_unpack
 
@@ -41,8 +44,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply -p0 "${FILESDIR}/${P}-update.patch"
-	eapply -p0 "${FILESDIR}/${P}-config.c.patch"
 	default
 	./autogen.sh
 	eautoreconf
@@ -62,8 +63,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn ""
-	ewarn "OpenBGPD portable (not running on OpenBSD) can’t export its RIB to"
-	ewarn "the FIB. It’s only suitable for route-reflectors or route-servers."
-	ewarn ""
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		ewarn ""
+		ewarn "OpenBGPD portable (not running on OpenBSD) can’t export its RIB"
+		ewarn "to the FIB. It’s only suitable for route-reflectors or"
+		ewarn "route-servers."
+		ewarn ""
+	fi
 }
diff --git a/net-misc/rpki-client/Manifest b/net-misc/rpki-client/Manifest
index 81828be9c8..afc9431a25 100644
--- a/net-misc/rpki-client/Manifest
+++ b/net-misc/rpki-client/Manifest
@@ -1 +1,2 @@
 DIST rpki-client-0.3.0.tar.gz 81004 BLAKE2B 1831ed0aab4f4112391ba2c40c7b335f5284c4fe13d2e0e59e5996c909368285073018a3d9b431f88fdc347a8281d2fc4613de68badcab011061e7274d3df2bf SHA512 92f62b3137a3848aa3cf27b5b303b1ce097da961dcb684b8bad9fa224690f2f233658bd3c73e48d60d3c7df965173a1c935b0497a61084fe0986dce4feb4bd70
+DIST rpki-client-6.6_p2.tar.gz 42840 BLAKE2B f5075376925cad57893a27c463c6727362e108cbccb348785ca4940fbaa8262286342ecb6f5fa59a0615009bc16571b15218483822c827528ecc19e1963c9e6b SHA512 5acdabef9b0373fb2fe47a2b9cb2638809ac1260b273c1566e3dbd34287c3703dd7979a7ba98b7d5b305664add6f2d5af4564ad2315033406e5e835f1051951f
diff --git a/net-misc/rpki-client/files/rpki-client-6.6-update.patch b/net-misc/rpki-client/files/rpki-client-6.6-update.patch
new file mode 100644
index 0000000000..88251433bd
--- /dev/null
+++ b/net-misc/rpki-client/files/rpki-client-6.6-update.patch
@@ -0,0 +1,23 @@
+--- a/update.sh	2020-05-19 20:19:49.501990424 +0200
++++ b/update.sh	2020-05-19 20:20:15.889108790 +0200
+@@ -4,20 +4,6 @@
+ openbsd_branch=`cat OPENBSD_BRANCH`
+ openbgpd_version=`cat VERSION`
+ 
+-# pull in latest upstream code
+-echo "pulling upstream openbsd source"
+-if [ ! -d openbsd ]; then
+-	if [ -z "${RPKICLIENT_GIT}" ]; then
+-		git clone https://github.com/rpki-client/rpki-client-openbsd.git openbsd
+-	else
+-		git clone "${RPKICLIENT_GIT}/openbsd"
+-	fi
+-fi
+-(cd openbsd/src
+- git fetch
+- git checkout "${openbsd_branch}"
+- git pull --rebase)
+-
+ # setup source paths
+ dir=`pwd`
+ patches="${dir}/patches"
diff --git a/net-misc/rpki-client/rpki-client-6.6_p2.ebuild b/net-misc/rpki-client/rpki-client-6.6_p2.ebuild
new file mode 100644
index 0000000000..30ee0313f9
--- /dev/null
+++ b/net-misc/rpki-client/rpki-client-6.6_p2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020 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}"
+
+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"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	acct-group/_rpki-client
+	acct-user/_rpki-client
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-${PV%_*}-update.patch"
+)
+
+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
+		--with-base-dir="/var/cache/${PN}"
+		--with-output-dir="/var/db/${PN}"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" BINDIR="/usr/bin" MANDIR="/usr/share/man" install
+	insinto /etc/rpki
+	doins tals/*
+	keepdir "/var/db/${PN}/"
+	fowners -R _rpki-client "/var/db/${PN}/"
+}