diff --git a/net-misc/openbgpd/Manifest b/net-misc/openbgpd/Manifest
index 7af53b4..d746f9e 100644
--- a/net-misc/openbgpd/Manifest
+++ b/net-misc/openbgpd/Manifest
@@ -1 +1,2 @@
-DIST openbgpd-6.6.tar.gz 57895 BLAKE2B af4b9dce9cf97e8e47ef4e64bc8f319620920e3c6d4115a626827e82babd78b5d5aad177748edf5de7b9587644d5e0fb27d9707b4fc09e939f3f31adcacb6f5d SHA512 0726c8ad61d49519ab96b9cb1986c2ae84386095dcb9bbe368f86bc3aa3db4623aa11aac2c7e4e66f9e49dcaac6fc498571a2301f9697abcf64715b128321dff
+DIST openbgpd-6.6p0.tar.gz 676732 BLAKE2B 80b391ead81d8d3bd20fe9b3eb3f8976485d29241f30c7395c678ff3f0fd87b2f3036b2ebb502ff0ca27d79f4fbbe6ba93576069edb32f004705d71d92e2b3a2 SHA512 07a7599b3ab14181575dc38647b307a4efa7d5dfa8a7aefe70483eb6773cb792eac788a10ea865d78daa59f197fc2d9cd2ce96d0c0251564507963716057fee0
+DIST openbgpd-portable-master.zip 79593 BLAKE2B 7a19522d015076491e698d5dd4434dfaab88ae2dde00b5cbc16122fb3be8a3bbe6906a89ed50d173806298e0e86737f93d7c6be57461ada6c7bb50699a19cbdd SHA512 6d55527c3955457f40c95ff1164f4f6f8c0a8b326c8a632014f83150ffb238eb393053a54b608d650b3756255588b155d537e1a0d228e2961d8f9890e3da641d
diff --git a/net-misc/openbgpd/files/openbgpd-6.6-update.patch b/net-misc/openbgpd/files/openbgpd-6.6-update.patch
deleted file mode 100644
index a60752d..0000000
--- a/net-misc/openbgpd/files/openbgpd-6.6-update.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- update.sh	2020-03-20 15:14:46.462983445 +0100
-+++ update.sh	2020-03-20 15:14:56.473090379 +0100
-@@ -13,10 +13,6 @@
- 		git clone "${OPENBGPD_GIT}/openbsd"
- 	fi
- fi
--(cd openbsd
-- git fetch
-- git checkout "${openbsd_branch}"
-- git pull --rebase)
- 
- # setup source paths
- dir=`pwd`
diff --git a/net-misc/openbgpd/files/openbgpd-6.6_p0-config.c.patch b/net-misc/openbgpd/files/openbgpd-6.6_p0-config.c.patch
new file mode 100644
index 0000000..e009cdf
--- /dev/null
+++ b/net-misc/openbgpd/files/openbgpd-6.6_p0-config.c.patch
@@ -0,0 +1,12 @@
+--- src/bgpd/config.c	2020-03-20 17:55:04.089577745 +0100
++++ src/bgpd/config.c	2020-03-20 17:56:01.480205070 +0100
+@@ -343,7 +343,8 @@
+ 		fatal("getifaddrs");
+ 
+ 	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+-		if (ifa->ifa_addr->sa_family != AF_INET)
++		if (ifa->ifa_addr == NULL ||
++		    ifa->ifa_addr->sa_family != AF_INET)
+ 			continue;
+ 		cur = ((struct sockaddr_in *)ifa->ifa_addr)->sin_addr.s_addr;
+ 		if ((cur & localnet) == localnet)	/* skip 127/8 */
diff --git a/net-misc/openbgpd/files/openbgpd-6.6-config.c.patch b/net-misc/openbgpd/files/openbgpd-9999-config.c.patch
similarity index 100%
rename from net-misc/openbgpd/files/openbgpd-6.6-config.c.patch
rename to net-misc/openbgpd/files/openbgpd-9999-config.c.patch
diff --git a/net-misc/openbgpd/files/openbgpd-6.5-update.patch b/net-misc/openbgpd/files/openbgpd-9999-update.patch
similarity index 100%
rename from net-misc/openbgpd/files/openbgpd-6.5-update.patch
rename to net-misc/openbgpd/files/openbgpd-9999-update.patch
diff --git a/net-misc/openbgpd/files/openbgpd-conf.d b/net-misc/openbgpd/files/openbgpd-conf.d
new file mode 100644
index 0000000..34055de
--- /dev/null
+++ b/net-misc/openbgpd/files/openbgpd-conf.d
@@ -0,0 +1,7 @@
+# /etc/conf.d/bgpd: config file for openbsd's bgpd
+
+# See bgpd(8) man page ... some popular options:
+#     -f file     Use file as the configuration file, instead of the default
+#                 /etc/bgpd.conf.
+#
+BGPD_OPTS=""
diff --git a/net-misc/openbgpd/files/openbgpd-init.d b/net-misc/openbgpd/files/openbgpd-init.d
new file mode 100755
index 0000000..40724a2
--- /dev/null
+++ b/net-misc/openbgpd/files/openbgpd-init.d
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="bgpd daemon"
+description="OpenBGPD is a free implementation of BGPv4"
+command=/usr/sbin/bgpd
+command_args="${BGPD_OPTS}"
+
+extra_started_commands="reload"
+
+depend() {
+	use net
+	use logger
+}
+
+reload() {
+	${command} -n || return 1
+	ebegin "Reloading bgpd"
+	/usr/sbin/bgpctl reload
+	eend $?
+}
diff --git a/net-misc/openbgpd/openbgpd-6.6_p0.ebuild b/net-misc/openbgpd/openbgpd-6.6_p0.ebuild
new file mode 100644
index 0000000..797a152
--- /dev/null
+++ b/net-misc/openbgpd/openbgpd-6.6_p0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PV="${PV/_p/p}"
+#MY_PN="openbgpd-portable"
+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}
+	acct-group/_bgpd
+	acct-user/_bgpd
+"
+BDEPEND="
+	sys-devel/libtool
+"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/${MY_P}" "${S}"
+}
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}/${P}-config.c.patch"
+	default
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}-init.d" bgpd
+	newconfd "${FILESDIR}/${PN}-conf.d" bgpd
+}
+
+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 ""
+}
diff --git a/net-misc/openbgpd/openbgpd-6.6.ebuild b/net-misc/openbgpd/openbgpd-9999.ebuild
similarity index 77%
rename from net-misc/openbgpd/openbgpd-6.6.ebuild
rename to net-misc/openbgpd/openbgpd-9999.ebuild
index 1b6812b..b088603 100644
--- a/net-misc/openbgpd/openbgpd-6.6.ebuild
+++ b/net-misc/openbgpd/openbgpd-9999.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 inherit autotools git-r3
 
-MY_P="${P}p0"
-MY_PV="${PV}p0"
-MY_PN="openbgpd-portable-${MY_PV}"
+MY_PV="master"
+MY_PN="openbgpd-portable"
+MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="OpenBGPD is a free implementation of BGPv4"
 HOMEPAGE="http://www.openbgpd.org/index.html"
-SRC_URI="https://github.com/openbgpd-portable/openbgpd-portable/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/master.zip -> ${MY_P}.zip"
 
 EGIT_REPO_URI="https://github.com/openbgpd-portable/openbgpd-openbsd.git"
 EGIT3_STORE_DIR="${S}/git"
@@ -19,7 +19,7 @@ EGIT_CHECKOUT_DIR="${S}/openbsd"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND=""
@@ -37,7 +37,7 @@ BDEPEND="
 
 src_unpack() {
 	unpack ${A}
-	mv "${WORKDIR}/${MY_PN}" "${S}"
+	mv "${WORKDIR}/${MY_P}" "${S}"
 
 	EGIT_BRANCH=$(cat "${S}"/OPENBSD_BRANCH)
 	git-r3_fetch
@@ -57,6 +57,13 @@ src_configure() {
 	default
 }
 
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}-init.d" bgpd
+	newconfd "${FILESDIR}/${PN}-conf.d" bgpd
+}
+
 pkg_postinst() {
 	ewarn ""
 	ewarn "OpenBGPD portable (not running on OpenBSD) can’t export its RIB to"