diff --git a/net/radvd/Makefile b/net/radvd/Makefile
index 279eff677b23..2ccaa158e7db 100644
--- a/net/radvd/Makefile
+++ b/net/radvd/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	radvd
 PORTVERSION=	2.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.litech.org/radvd/dist/
 
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Linux/BSD IPv6 router advertisement daemon
 WWW=		http://www.litech.org/radvd/
 
 LICENSE=	RADVD
 LICENSE_NAME=	RADVD License
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
 CONFIGURE_ARGS=	--program-transform-name=
 USE_RC_SUBR=	radvd
 
 PORTDOCS=	CHANGES COPYRIGHT INTRO.html README TODO
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/radvd.conf.example ${STAGEDIR}${PREFIX}/etc/radvd.conf.sample
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S.^.${WRKSRC}/.} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/radvd/files/patch-device-bsd44.c b/net/radvd/files/patch-device-bsd44.c
index 721c6785978e..003e0a30de5f 100644
--- a/net/radvd/files/patch-device-bsd44.c
+++ b/net/radvd/files/patch-device-bsd44.c
@@ -1,40 +1,40 @@
 --- device-bsd44.c.orig	2019-07-20 03:58:19 UTC
 +++ device-bsd44.c
 @@ -126,8 +126,29 @@ ret:
  	return -1;
  }
  
 -int setup_allrouters_membership(int sock, struct Interface *iface) { return 0; }
 +int setup_allrouters_membership(int sock, struct Interface *iface) 
 +{
 +	struct ipv6_mreq mreq;
  
 +	memset(&mreq, 0, sizeof(mreq));
 +	mreq.ipv6mr_interface = iface->props.if_index;
 +
 +	/* all-routers multicast address */
 +	if (inet_pton(AF_INET6, "ff02::2",
 +			&mreq.ipv6mr_multiaddr.s6_addr) != 1) {
 +		flog(LOG_ERR, "inet_pton failed");
 +		return (-1);
 +	}
 +
 +	if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP,
-+			&mreq, sizeof(mreq)) < 0 && !iface->state_info.ready) {
++			&mreq, sizeof(mreq)) < 0 && errno != EADDRINUSE) {
 +		flog(LOG_ERR, "can't join ipv6-allrouters on %s", iface->props.name);
 +		return (-1);
 +	}
 +
 +	return 0; 
 +}
 +
  int set_interface_linkmtu(const char *iface, uint32_t mtu)
  {
  	dlog(LOG_DEBUG, 4, "setting LinkMTU (%u) for %s is not supported", mtu, iface);
 @@ -161,5 +182,5 @@ int check_ip6_forwarding(void)
  int check_ip6_iface_forwarding(const char *iface)
  {
  	dlog(LOG_DEBUG, 4, "checking ipv6 forwarding of interface not supported");
 -	return -1;
 +	return 1;
  }