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
index e009cdf..32be653 100644
--- a/net-misc/openbgpd/files/openbgpd-6.6_p0-config.c.patch
+++ b/net-misc/openbgpd/files/openbgpd-6.6_p0-config.c.patch
@@ -1,5 +1,5 @@
---- src/bgpd/config.c	2020-03-20 17:55:04.089577745 +0100
-+++ src/bgpd/config.c	2020-03-20 17:56:01.480205070 +0100
+--- a/src/bgpd/config.c	2020-03-20 17:55:04.089577745 +0100
++++ b/src/bgpd/config.c	2020-03-20 17:56:01.480205070 +0100
 @@ -343,7 +343,8 @@
  		fatal("getifaddrs");
  
diff --git a/net-misc/openbgpd/openbgpd-6.6_p0.ebuild b/net-misc/openbgpd/openbgpd-6.6_p0.ebuild
index 1e9a657..ac7a997 100644
--- a/net-misc/openbgpd/openbgpd-6.6_p0.ebuild
+++ b/net-misc/openbgpd/openbgpd-6.6_p0.ebuild
@@ -6,7 +6,6 @@ EAPI=7
 inherit systemd
 
 MY_PV="${PV/_p/p}"
-#MY_PN="openbgpd-portable"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="OpenBGPD is a free implementation of BGPv4"
@@ -29,15 +28,11 @@ BDEPEND="
 	sys-devel/libtool
 "
 
-src_unpack() {
-	default
-	mv "${WORKDIR}/${MY_P}" "${S}"
-}
+S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${P}-config.c.patch"
-	default
-}
+PATCHES=(
+	"${FILESDIR}/${P}-config.c.patch"
+)
 
 src_install() {
 	default