diff --git a/net/bird2/Makefile b/net/bird2/Makefile
index 6660aa8df6b0..bc5d2af17480 100644
--- a/net/bird2/Makefile
+++ b/net/bird2/Makefile
@@ -1,63 +1,64 @@
 # Created by: Alexander V. Chernikov <melifaro@FreeBSD.org>
 
 PORTNAME=	bird
 DISTVERSION=	2.0.8
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://bird.network.cz/download/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	olivier@FreeBSD.org
 COMMENT=	Dynamic IP routing daemon
 
 LICENSE=	GPLv2
 
 USES=		bison gmake ncurses readline
 
 CONFLICTS=	bird-[0-9]*
 CONFLICTS+=	bird6-[0-9]*
 
 USE_CSTD=	gnu99
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var
 USE_RC_SUBR=	bird
 SUB_FILES=	pkg-message
 
 GROUPS=		birdvty
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_MULTI=	RP
 RP_DESC=	Routing Protocols
 OPTIONS_MULTI_RP=	BFD BABEL BGP MRT OSPF PIPE RADV RIP RPKI STATIC
 OPTIONS_DEFAULT=	${OPTIONS_MULTI_RP}
 
 BFD_DESC=	Bidirectional Forwarding Detection
 BABEL_DESC=	Babel routing protocol
 BGP_DESC=	Border Gateway Protocol
 MRT_DESC=	Dumping Routing Information in MRT Format
 OSPF_DESC=	Open Short Path First
 PIPE_DESC=	PIPE routing
 RADV_DESC=	Router Advertisement
 RIP_DESC=	Routing Information Protocol
 RPKI_DESC=	Resource Public Key Infrastructure
 STATIC_DESC=	Static routing
 
 BFD_VARS=	rt_prot+=bfd
 BABEL_VARS=	rt_prot+=babel
 BGP_VARS=	rt_prot+=bgp
 MRT_VARS=	rt_prot+=mrt
 OSPF_VARS=	rt_prot+=ospf
 PIPE_VARS=	rt_prot+=pipe
 RADV_VARS=	rt_prot+=radv
 RIP_VARS=	rt_prot+=rip
 RPKI_VARS=	rt_prot+=rpki
 STATIC_VARS=	rt_prot+=static
 
 CONFIGURE_ARGS+=--with-protocols="${RT_PROT}"
 RPKI_LIB_DEPENDS=	libssh.so:security/libssh
 
 post-patch:
 	#${REINPLACE_CMD} -e 's|\.example|\.sample|g' ${WRKSRC}/Makefile.in
 	#${MV} ${WRKSRC}/doc/bird.conf ${WRKSRC}/doc/bird.conf.sample
 
 .include <bsd.port.mk>
diff --git a/net/bird2/files/patch-Makefile.in b/net/bird2/files/patch-Makefile.in
index 71c91600c45e..8bddd6d09554 100644
--- a/net/bird2/files/patch-Makefile.in
+++ b/net/bird2/files/patch-Makefile.in
@@ -1,15 +1,15 @@
---- Makefile.in.orig	2019-01-08 06:06:39.654833000 +0100
-+++ Makefile.in	2019-01-08 06:06:53.077532000 +0100
-@@ -188,11 +188,7 @@
+--- Makefile.in.orig	2021-03-21 22:29:42 UTC
++++ Makefile.in
+@@ -206,11 +206,7 @@ install: all
  	for BIN in bird @CLIENT@ ; do								\
  		$(INSTALL_PROGRAM) $(exedir)/$$BIN $(DESTDIR)/$(sbindir)/$$BIN ;		\
  	done
 -	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
 -		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;	\
 -	else											\
 -		echo "Not overwriting old bird.conf" ;						\
 -	fi
 +	$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@.sample ;	\
  
  install-docs:
  	$(INSTALL) -d $(DESTDIR)/$(docdir)
diff --git a/net/bird2/files/patch-proto_babel_babel.c b/net/bird2/files/patch-proto_babel_babel.c
new file mode 100644
index 000000000000..25cee54f7edc
--- /dev/null
+++ b/net/bird2/files/patch-proto_babel_babel.c
@@ -0,0 +1,24 @@
+--- proto/babel/babel.c.orig	2021-04-16 21:18:15 UTC
++++ proto/babel/babel.c
+@@ -1658,10 +1658,6 @@ babel_if_notify(struct proto *P, unsigned flags, struc
+     if (!(iface->flags & IF_UP))
+       return;
+ 
+-    /* We only speak multicast */
+-    if (!(iface->flags & IF_MULTICAST))
+-      return;
+-
+     /* Ignore ifaces without link-local address */
+     if (!iface->llv6)
+       return;
+@@ -1734,10 +1730,6 @@ babel_reconfigure_ifaces(struct babel_proto *p, struct
+   WALK_LIST(iface, iface_list)
+   {
+     if (!(iface->flags & IF_UP))
+-      continue;
+-
+-    /* Ignore non-multicast ifaces */
+-    if (!(iface->flags & IF_MULTICAST))
+       continue;
+ 
+     /* Ignore ifaces without link-local address */