diff --git a/metadata/md5-cache/net-misc/openbgpd-8.3 b/metadata/md5-cache/net-misc/openbgpd-8.3
deleted file mode 100644
index 42febff..0000000
--- a/metadata/md5-cache/net-misc/openbgpd-8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/libtool virtual/pkgconfig
-DEFINED_PHASES=install postinst
-DESCRIPTION=OpenBGPD is a free implementation of BGPv4
-EAPI=7
-HOMEPAGE=http://www.openbgpd.org/index.html
-INHERIT=systemd
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=!!net-misc/frr acct-group/_bgpd acct-user/_bgpd
-SLOT=0
-SRC_URI=mirror://openbsd/OpenBGPD/openbgpd-8.3.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942
-_md5_=c14b75b7f914b1160a60cb1002791e3f
diff --git a/metadata/md5-cache/net-misc/openbgpd-8.4 b/metadata/md5-cache/net-misc/openbgpd-8.4
index 75e2186..0d251f4 100644
--- a/metadata/md5-cache/net-misc/openbgpd-8.4
+++ b/metadata/md5-cache/net-misc/openbgpd-8.4
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=!!net-misc/frr acct-group/_bgpd acct-user/_bgpd
 SLOT=0
 SRC_URI=mirror://openbsd/OpenBGPD/openbgpd-8.4.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942
+_eclasses_=toolchain-funcs	333970c740aa7b1a92e4fcdc52f612bd	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942
 _md5_=8b92058a494b0061051bd28d0926748d
diff --git a/metadata/md5-cache/net-misc/openbgpd-8.5 b/metadata/md5-cache/net-misc/openbgpd-8.5
index c7ac3c6..cec75a8 100644
--- a/metadata/md5-cache/net-misc/openbgpd-8.5
+++ b/metadata/md5-cache/net-misc/openbgpd-8.5
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=!!net-misc/frr acct-group/_bgpd acct-user/_bgpd
 SLOT=0
 SRC_URI=mirror://openbsd/OpenBGPD/openbgpd-8.5.tar.gz
-_eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942
+_eclasses_=toolchain-funcs	333970c740aa7b1a92e4fcdc52f612bd	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942
 _md5_=8b92058a494b0061051bd28d0926748d
diff --git a/metadata/md5-cache/net-misc/openbgpd-8.6 b/metadata/md5-cache/net-misc/openbgpd-8.6
new file mode 100644
index 0000000..9eb93c8
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openbgpd-8.6
@@ -0,0 +1,14 @@
+BDEPEND=dev-build/libtool virtual/pkgconfig
+DEFINED_PHASES=install postinst
+DEPEND=!!net-misc/frr acct-group/_bgpd acct-user/_bgpd dev-libs/libevent net-libs/libmnl
+DESCRIPTION=OpenBGPD is a free implementation of BGPv4
+EAPI=8
+HOMEPAGE=http://www.openbgpd.org/index.html
+INHERIT=systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=!!net-misc/frr acct-group/_bgpd acct-user/_bgpd dev-libs/libevent net-libs/libmnl
+SLOT=0
+SRC_URI=mirror://openbsd/OpenBGPD/openbgpd-8.6.tar.gz
+_eclasses_=toolchain-funcs	333970c740aa7b1a92e4fcdc52f612bd	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942
+_md5_=468d820ee512fd3e0205015f65e1cc5a
diff --git a/metadata/md5-cache/net-misc/openbgpd-9999 b/metadata/md5-cache/net-misc/openbgpd-9999
index 804a2d4..c235005 100644
--- a/metadata/md5-cache/net-misc/openbgpd-9999
+++ b/metadata/md5-cache/net-misc/openbgpd-9999
@@ -8,5 +8,5 @@ LICENSE=ISC
 PROPERTIES=live
 RDEPEND=!!net-misc/frr acct-group/_bgpd acct-user/_bgpd
 SLOT=0
-_eclasses_=gnuconfig	a397adda6984a4c423e28ac274c1ba98	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	5f49a16f67f81bdf873e3d1f10b10001	autotools	d12ccbad07b44642a75ac97a3334d8e0	git-r3	875eb471682d3e1f18da124be97dcc81	systemd	c8b03e8df84486aa991d4396686e8942
+_eclasses_=gnuconfig	a397adda6984a4c423e28ac274c1ba98	toolchain-funcs	333970c740aa7b1a92e4fcdc52f612bd	multilib	c19072c3cd7ac5cb21de013f7e9832e0	libtool	5f49a16f67f81bdf873e3d1f10b10001	autotools	d12ccbad07b44642a75ac97a3334d8e0	git-r3	875eb471682d3e1f18da124be97dcc81	systemd	c8b03e8df84486aa991d4396686e8942
 _md5_=014e5950f10828b313f69ca94ee17f51
diff --git a/net-misc/openbgpd/Manifest b/net-misc/openbgpd/Manifest
index d56d702..4300c30 100644
--- a/net-misc/openbgpd/Manifest
+++ b/net-misc/openbgpd/Manifest
@@ -1,3 +1,3 @@
-DIST openbgpd-8.3.tar.gz 839081 BLAKE2B e318cf48f7e65f1077740d6b0e0f4f58f5ba88d19b6f76cd8b738e107a1cdae34a9fa3f7ce52daa094d13e4bb9aa262438213d353f57e37af8d112e6b4c6b56f SHA512 a873254c8996c489b170a6fd74a2eaf7052f89e673ac4a5bbd019bcb28a65d9978af4530d6b242252e96789910cd2e81b6f265e507dfa6050cd57664609adb2b
 DIST openbgpd-8.4.tar.gz 841272 BLAKE2B 1a7ea4a2ada7ff11f4311672c6ade0b233cdfc03b9b478e283ce92b36259980e74f78c89e96473f01bd4a51e6104e1c5d8027f92a675555423a171c9adf5f852 SHA512 4774d693ebfd9ba4f4fb355cb19f671d6f229284dc45483fafc8517f7b1d1a583e4657bf8d3f54d559b177e8959a536d0b50f70f0270d57ddf8dc2b6290c5fb6
 DIST openbgpd-8.5.tar.gz 848032 BLAKE2B 74bfaa718000aa5329b2d70cc86869606107bc061f858655678c9734a403ddb521e66b195b649b3e09f42d07098081218963e929389a55d43b4424bf14f81bf4 SHA512 4f1592e3b83b4aeea35ac42a2bfed3072a4003de560055d06bdc27c02f82679860b298636faa27843752e291f50a47f70bf3314c66167d77077e0dc11f825a52
+DIST openbgpd-8.6.tar.gz 851232 BLAKE2B 604ca04444bb4b5da800f3dea1b70228162bd9ebac7f621c27e341b1129165155c76d115f8b0e25cdaf15b92cba59f7c8cfc5f251ef806c9d345210540aaea10 SHA512 1dce01a7c9939f2097f6cc5cebaa6a9c9531bb244d93c22457bc0d8438412c277e9c4a1ddda4580394b8e88dda6856838dac1e8c4e855f58a73b4ca062800672
diff --git a/net-misc/openbgpd/openbgpd-8.3.ebuild b/net-misc/openbgpd/openbgpd-8.6.ebuild
similarity index 87%
rename from net-misc/openbgpd/openbgpd-8.3.ebuild
rename to net-misc/openbgpd/openbgpd-8.6.ebuild
index f6272cf..7672136 100644
--- a/net-misc/openbgpd/openbgpd-8.3.ebuild
+++ b/net-misc/openbgpd/openbgpd-8.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd
 
@@ -12,24 +12,24 @@ 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"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
 RDEPEND="
-	${DEPEND}
 	!!net-misc/frr
 	acct-group/_bgpd
 	acct-user/_bgpd
+	dev-libs/libevent
+	net-libs/libmnl
 "
+DEPEND="${RDEPEND}"
 BDEPEND="
-	sys-devel/libtool
+	dev-build/libtool
 "
 
-S="${WORKDIR}/${MY_P}"
-
 src_install() {
 	default