diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 7365755..f012a7c 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,5 +1,5 @@
 DIST bird-1.6.8.tar.gz 1042222 BLAKE2B 65974c936a711dfa14d43817a4d23420ebbed317da4ec6211a2e36f031af917f90e34f4ab580802552cf5c506d819dbee663716b9a765ae9f2906ea44ab5cec6 SHA512 0a777ea1b7e613bd1048e7baf83c2f3636fd50b79b2b9570ab3db3e0981ce3703836d69f6fb1143222d8d4c6883936014a04d303e3c07c4ce1e6e60c938616d0
-DIST bird-2.0.11.tar.gz 1301502 BLAKE2B 0761bd50b3b0338ecf2a6325f61f90db9f92324ed814de2ec6b360c6f5a7e12d6ae4ae9b73a11ddede0e6c8fd1d15bea1b62076c38c937ae281f10a8bc2d1cbf SHA512 aaab11b4faf7d0c0afc3c4e3480f24ab6e0037b209aee969192eea57bef698073da5fa9155ef43d999ed91cbe3cd87acb95aa08fa03f2525c5c7653a0589dcf6
 DIST bird-2.13.1.tar.gz 1331459 BLAKE2B af82916033cefa08bb781a4b428623f08d1ec61bf99cf1e8f04d598593fdadfc8c6b5e8739b023661c5e9289afa3e5cf1d5e7709d282503916e0c4e12caf79d1 SHA512 2531b90c425e76117726c796a519e8aeaf846b09857fd2a39e8eb41a71c49176f088e6933af81ea954a61148ef45342885049a73a9a73f38ebf857154016c743
 DIST bird-2.14.tar.gz 1396217 BLAKE2B fe16b89c7f0ff35c5126366920960e0c55f57fe343380b2c32230122cf24f9abc3eb4d6ed9f37d2176f9e9340a83dffd1e68fed276b59b86cf1bdf5b8bd3c169 SHA512 f6b0672df048cfb78d289030675799e6d19db49d8cc458778d36a4e7c10a15be161dd101d7b03cf017f0fa948206d6504b59139515cbb80acc5bb1fdaa4358b9
+DIST bird-2.15.1.tar.gz 1409653 BLAKE2B c3fe95ae2b8a3dca036278c8014f3ce2d1fd224c65c10abcc77b2cc1dbdfaa1b5766e8643b873a12ac33f00cd5e866aa7ce853ead78150ec4314b53457ad554a SHA512 75828ae7c3e574097ba6d7e38dd275ada3b078e215454478f2ed9898f7f8447b149e9ba4f47de05a2b8f4e4959b5ee8d46bee0ef58c79b9cb908a44e12df2842
 DIST bird-3.0alpha1.tar.gz 2415234 BLAKE2B c0a035500c4b5e9abd426c8f6835c9c1cb2be0f908803a17b7d6995de41d704c5667bf4e5037bcc19e166629aabe8a411f899d7df719564af4cf93fda9c6f362 SHA512 e41fd923a7e29ba16d70aaf4a5fe70913abc65d84b39bffe1a24fbb70e407ce9eac1b8189c3aecd5b88928dfc7ae62d6a2685dd8aa7de808f73edc918d604cc1
diff --git a/net-misc/bird/bird-2.0.11.ebuild b/net-misc/bird/bird-2.15.1.ebuild
similarity index 60%
rename from net-misc/bird/bird-2.0.11.ebuild
rename to net-misc/bird/bird-2.15.1.ebuild
index 9e14155..764c701 100644
--- a/net-misc/bird/bird-2.0.11.ebuild
+++ b/net-misc/bird/bird-2.15.1.ebuild
@@ -11,8 +11,8 @@ SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="+client debug libssh"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="bmp +client custom-cflags debug libssh"
 
 RDEPEND="
 	client? (
@@ -36,21 +36,35 @@ FILECAPS=(
 	CAP_NET_RAW				usr/sbin/bird
 )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.9-musl-tests.patch"
-)
-
 src_prepare() {
 	default
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable client) \
-		$(use_enable debug) \
+	# This export makes compilation and test phases verbose
+	export VERBOSE=1
+
+	protocols="aggregator bfd babel bgp l3vpn mrt ospf perf pipe radv rip rpki static"
+	if use bmp; then
+		protocols="${protocols} bmp"
+	fi
+
+	local myargs=(
+		--localstatedir="${EPREFIX}/var"
+		--with-protocols="${protocols}"
+		$(use_enable client)
+		$(use_enable debug)
 		$(use_enable libssh)
+	)
+
+	# lto must be enabled by default as bird is mono-threaded and use several
+	# optimisations to be fast, as it may very likely be exposed to several
+	# thounsand BGP updates per seconds
+	# Although, we make it possible to deactivate it if wanted
+	use custom-cflags && myargs+=( bird_cv_c_lto=no )
+
+	econf "${myargs[@]}"
 }
 
 src_install() {