diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index f609cd0..e52ffff 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,3 +1,4 @@
 DIST bird-1.6.8.tar.gz 1042222 BLAKE2B 65974c936a711dfa14d43817a4d23420ebbed317da4ec6211a2e36f031af917f90e34f4ab580802552cf5c506d819dbee663716b9a765ae9f2906ea44ab5cec6 SHA512 0a777ea1b7e613bd1048e7baf83c2f3636fd50b79b2b9570ab3db3e0981ce3703836d69f6fb1143222d8d4c6883936014a04d303e3c07c4ce1e6e60c938616d0
 DIST bird-2.0.6.tar.gz 1899912 BLAKE2B 068f740a01a327b5fecf10a8aaafecac218fd14536ea98c93980d7ef9426766be80c68202410aaa20012f7f3b1837173e51d83d0ce2fb1828029d54174065206 SHA512 22aa676e171cf5ddf6dedbf0dfe9bb36a959efdf9cb278b7e969d5b08b06fe483e3b30ef40c1f9980387ed6ac6ee6626f3d85704925256c22dae91fa7d23267d
 DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
+DIST bird-2.0.8.tar.gz 1135228 BLAKE2B 4b36688ac85967ad8c39d9c37dc717d77b1cb5c3ec44a0cf4e84ff38b8d1710d10653a1333b50cd2ede79fd7f012ec86de0baefc9ac18435693ec5b3e43b8a3a SHA512 5f8ad63b1dcdcfdfd4c98f55601dda3a07dea3099fc51b52a340650ca475bd943ee6aac31a1e7735b7596b279e338697c65728754b97108ae687a05f566c94e2
diff --git a/net-misc/bird/bird-2.0.7_pre20200303.ebuild b/net-misc/bird/bird-2.0.8.ebuild
similarity index 74%
rename from net-misc/bird/bird-2.0.7_pre20200303.ebuild
rename to net-misc/bird/bird-2.0.8.ebuild
index 0ec75df..951b34a 100644
--- a/net-misc/bird/bird-2.0.7_pre20200303.ebuild
+++ b/net-misc/bird/bird-2.0.8.ebuild
@@ -1,37 +1,36 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools fcaps git-r3
+inherit fcaps
 
 DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
 HOMEPAGE="https://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
-EGIT_REPO_URI="https://gitlab.labs.nic.cz/labs/bird.git"
-EGIT_COMMIT="78e4a123bb937bb45f7eaebb0ea475095443bfd0"
 
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
 IUSE="+client debug libssh"
 
 RDEPEND="
-	client? ( sys-libs/ncurses )
-	client? ( sys-libs/readline )
+	client? ( sys-libs/ncurses:= )
+	client? ( sys-libs/readline:= )
 	filecaps? (
 		acct-group/bird
 		acct-user/bird
 	)
-	libssh? ( net-libs/libssh )
-"
-DEPEND="sys-devel/flex
+	libssh? ( net-libs/libssh:= )"
+BDEPEND="sys-devel/flex
 	sys-devel/bison
 	sys-devel/m4"
 
-src_prepare() {
-	default
-	eautoreconf
-}
+FILECAPS=(
+	CAP_NET_ADMIN			usr/sbin/bird
+	CAP_NET_BIND_SERVICE	usr/sbin/bird
+	CAP_NET_RAW				usr/sbin/bird
+)
 
 src_configure() {
 	econf \
@@ -52,12 +51,6 @@ src_install() {
 	dodoc doc/bird.conf.example
 }
 
-FILECAPS=(
-	CAP_NET_ADMIN			usr/sbin/bird
-	CAP_NET_BIND_SERVICE	usr/sbin/bird
-	CAP_NET_RAW				usr/sbin/bird
-)
-
 pkg_postinst() {
 	use filecaps && \
 		einfo "If you want to run bird as non-root, edit"