diff --git a/net/exabgp4/Makefile b/net/exabgp4/Makefile
index 40d849979a3b..c44ba1557fc7 100644
--- a/net/exabgp4/Makefile
+++ b/net/exabgp4/Makefile
@@ -1,57 +1,56 @@
 PORTNAME=	exabgp
-PORTVERSION=	4.2.13
-PORTREVISION=	2
+PORTVERSION=	4.2.21
 CATEGORIES=	net
 MASTER_SITES=	GH \
 		ZI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	BGP engine and route injector
 WWW=		https://github.com/Exa-Networks/exabgp
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENCE.txt
 
 USES=		python:3.6+ shebangfix
 USE_PYTHON=	distutils autoplist
 
 CONFLICTS_INSTALL=	exabgp
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_CMD=${PYTHON_CMD} \
 		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
 USE_RC_SUBR=	${PORTNAME}
 NO_ARCH=	yes
 
 SHEBANG_FILES=	etc/exabgp/run/*.run etc/exabgp/run/*.pl \
 		etc/exabgp/run/*.py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Exa-Networks
 
 USERS=		_bgpd
 GROUPS=		_bgpd
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|exabgp.env|${ETCDIR}/exabgp.env|' \
 		${WRKSRC}/lib/exabgp/application/bgp.py
 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|' \
 		${WRKSRC}/doc/man/exabgp.1 \
 		${WRKSRC}/lib/exabgp/configuration/usage.py \
 		${WRKSRC}/lib/exabgp/configuration/process/parser.py \
 		${WRKSRC}/lib/exabgp/application/flow.py \
 		${WRKSRC}/lib/exabgp/application/healthcheck.py \
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/exabgp.env ${STAGEDIR}${ETCDIR}/exabgp.env.sample
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/etc/exabgp && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/net/exabgp4/distinfo b/net/exabgp4/distinfo
index e716edc2b350..d668cd1c4281 100644
--- a/net/exabgp4/distinfo
+++ b/net/exabgp4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628777729
-SHA256 (Exa-Networks-exabgp-4.2.13_GH0.tar.gz) = 13add263c895fe4459bd4b62b92a1299c7039dcd99d3b074464e3c19029ad5e7
-SIZE (Exa-Networks-exabgp-4.2.13_GH0.tar.gz) = 2932003
+TIMESTAMP = 1663076170
+SHA256 (Exa-Networks-exabgp-4.2.21_GH0.tar.gz) = 5d5ce6e973fc966fa6aed4a1033b63722d95c8f8ba7bb44659694d659c3f7b7b
+SIZE (Exa-Networks-exabgp-4.2.21_GH0.tar.gz) = 2933721
diff --git a/net/exabgp4/files/patch-lib_exabgp_reactor_network_outgoing.py b/net/exabgp4/files/patch-lib_exabgp_reactor_network_outgoing.py
deleted file mode 100644
index 2bc959c98d78..000000000000
--- a/net/exabgp4/files/patch-lib_exabgp_reactor_network_outgoing.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/exabgp/reactor/network/outgoing.py.orig	2021-03-19 09:29:00 UTC
-+++ lib/exabgp/reactor/network/outgoing.py
-@@ -53,6 +53,8 @@ class Outgoing(Connection):
-             connect(self.io, self.peer, self.port, self.afi, self.md5)
-             return None
-         except Exception as exc:
-+            self.io.close()
-+            self.io = None
-             return exc
- 
-     def establish(self):