diff --git a/metadata/md5-cache/net-misc/bird-2.16.1 b/metadata/md5-cache/net-misc/bird-2.16.1
index 35fc1fc..2c2ad81 100644
--- a/metadata/md5-cache/net-misc/bird-2.16.1
+++ b/metadata/md5-cache/net-misc/bird-2.16.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/bison sys-devel/flex sys-devel/m4 >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
+BDEPEND=app-alternatives/yacc app-alternatives/lex sys-devel/m4 >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.17-r1:1.17 >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
 DEFINED_PHASES=configure install postinst prepare
 DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6
 EAPI=8
@@ -6,10 +6,10 @@ HOMEPAGE=https://bird.network.cz
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=autotools fcaps
 IUSE=+client custom-cflags debug libssh +filecaps
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm64 ~loong ~x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=client? ( sys-libs/ncurses:= sys-libs/readline:= ) filecaps? ( acct-group/bird acct-user/bird ) libssh? ( net-libs/libssh:= )
 SLOT=0
 SRC_URI=ftp://bird.network.cz/pub/bird/bird-2.16.1.tar.gz
 _eclasses_=gnuconfig	ddeb9f8caff1b5f71a09c75b7534df79	toolchain-funcs	14648d8795f7779e11e1bc7cf08b7536	multilib	b2a329026f2e404e9e371097dda47f96	libtool	6b28392a775f807c8be5fc7ec9a605b9	autotools	7d91cc798a8afd8f4e0c6e9587296ebe	fcaps	27152c9e4da035accb14a2d7879744ef
-_md5_=a001dcdd5f1b93c9558a7ddd31cb9ef6
+_md5_=a717692bba3cf4fe9e0ba8ca3f52c366
diff --git a/net-misc/bird/bird-2.16.1.ebuild b/net-misc/bird/bird-2.16.1.ebuild
index aae5606..b669d6a 100644
--- a/net-misc/bird/bird-2.16.1.ebuild
+++ b/net-misc/bird/bird-2.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~loong ~x86 ~x64-macos"
 IUSE="+client custom-cflags debug libssh"
 
 RDEPEND="
@@ -25,8 +25,8 @@ RDEPEND="
 	)
 	libssh? ( net-libs/libssh:= )"
 BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
+	app-alternatives/yacc
+	app-alternatives/lex
 	sys-devel/m4
 "
 
@@ -56,6 +56,8 @@ src_configure() {
 	# 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
+	# We force the value of the whole cflags var instead of only lto because of
+	# upstream commit 404e8261 (configure.ac: properly evaluate ac_test_CFLAGS)
 	use custom-cflags && myargs+=( bird_cflags_default=no ) || \
 		myargs+=( bird_cflags_default=yes )
 
@@ -77,8 +79,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	use filecaps && \
+	if use filecaps; then
 		einfo "If you want to run bird as non-root, edit"
 		einfo "'${EROOT}/etc/conf.d/bird' and set BIRD_GROUP and BIRD_USER with"
 		einfo "the wanted username."
+	fi
 }