diff --git a/net/openbgpd6/Makefile b/net/openbgpd6/Makefile
index caf404ad03a1..19c49e5ac094 100644
--- a/net/openbgpd6/Makefile
+++ b/net/openbgpd6/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	openbgpd
-PORTVERSION=	6.8p0
+PORTVERSION=	6.9p0
 CATEGORIES=	net
 MASTER_SITES=	OPENBSD/OpenBGPD
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Free implementation of the Border Gateway Protocol, Version 4
 
 LICENSE=	ISCL
 LICENSE_FILE=	${FILESDIR}/COPYING
 
 USES=		autoreconf libtool uidfix
 USE_RC_SUBR=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
 
 SUB_FILES=	pkg-message
 
 USERS=		_bgpd
 GROUPS=		_bgpd
 
 CONFLICTS=	zebra-[0-9]* quagga-[0-9]*
 
 OPTIONS_DEFINE=		IPV6LLPEER
 OPTIONS_DEFAULT=	IPV6LLPEER
 IPV6LLPEER_DESC=	Support nexthop using IPv6 link-local address
 IPV6LLPEER_MAKE_ARGS=	-DIPV6_LINKLOCAL_PEER
 
 .include <bsd.port.mk>
diff --git a/net/openbgpd6/distinfo b/net/openbgpd6/distinfo
index 55f85e71f623..33a80f613768 100644
--- a/net/openbgpd6/distinfo
+++ b/net/openbgpd6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603267757
-SHA256 (openbgpd-6.8p0.tar.gz) = 61487aed98071d9e975e9c38d1bfa0731dd7e55623f655372c318e665d928ff8
-SIZE (openbgpd-6.8p0.tar.gz) = 701164
+TIMESTAMP = 1620376440
+SHA256 (openbgpd-6.9p0.tar.gz) = b4a4a5cc240abeb7004594238523471bd1942a0786d1634a2d79c15da85c60bb
+SIZE (openbgpd-6.9p0.tar.gz) = 719173
diff --git a/net/openbgpd6/files/patch-src_bgpd_bgpd.h b/net/openbgpd6/files/patch-src_bgpd_bgpd.h
deleted file mode 100644
index 14df54585928..000000000000
--- a/net/openbgpd6/files/patch-src_bgpd_bgpd.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/bgpd/bgpd.h.orig	2020-05-19 09:24:33 UTC
-+++ src/bgpd/bgpd.h
-@@ -130,7 +130,8 @@ enum bgpd_process {
- 	PROC_MAIN,
- 	PROC_SE,
- 	PROC_RDE
--} bgpd_process;
-+};
-+extern enum bgpd_process bgpd_process;
- 
- enum reconf_action {
- 	RECONF_NONE,
-@@ -532,6 +533,10 @@ enum imsg_type {
- 	IMSG_XON,
- 	IMSG_XOFF
- };
-+
-+extern struct imsgbuf *ibuf_se;
-+extern struct imsgbuf *ibuf_rde;
-+extern struct imsgbuf *ibuf_main;
- 
- struct demote_msg {
- 	char		 demote_group[IFNAMSIZ];
diff --git a/net/openbgpd6/files/patch-src_bgpd_rde.c b/net/openbgpd6/files/patch-src_bgpd_rde.c
deleted file mode 100644
index e8204a8b1661..000000000000
--- a/net/openbgpd6/files/patch-src_bgpd_rde.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/bgpd/rde.c.orig	2020-05-04 14:45:09 UTC
-+++ src/bgpd/rde.c
-@@ -99,11 +99,9 @@ void		 rde_shutdown(void);
- int		 ovs_match(struct prefix *, u_int32_t);
- 
- volatile sig_atomic_t	 rde_quit = 0;
--struct bgpd_config	*conf, *nconf;
-+static struct bgpd_config	*conf, *nconf;
- struct filter_head	*out_rules, *out_rules_tmp;
--struct imsgbuf		*ibuf_se;
- struct imsgbuf		*ibuf_se_ctl;
--struct imsgbuf		*ibuf_main;
- struct rde_memstats	 rdemem;
- int			 softreconfig;
- 
diff --git a/net/openbgpd6/files/patch-src_bgpd_session.c b/net/openbgpd6/files/patch-src_bgpd_session.c
deleted file mode 100644
index fbb2ecf5b0c4..000000000000
--- a/net/openbgpd6/files/patch-src_bgpd_session.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/bgpd/session.c.orig	2020-05-19 09:24:33 UTC
-+++ src/bgpd/session.c
-@@ -100,13 +100,13 @@ void		 session_template_clone(struct peer *, struct so
- 		    u_int32_t, u_int32_t);
- int		 session_match_mask(struct peer *, struct bgpd_addr *);
- 
--struct bgpd_config	*conf, *nconf;
-+static struct bgpd_config	*conf, *nconf;
-+struct ctl_conns ctl_conns;
- struct bgpd_sysdep	 sysdep;
- volatile sig_atomic_t	 session_quit;
- int			 pending_reconf;
- int			 csock = -1, rcsock = -1;
- u_int			 peer_cnt;
--struct imsgbuf		*ibuf_rde;
- struct imsgbuf		*ibuf_rde_ctl;
- struct imsgbuf		*ibuf_main;
- 
diff --git a/net/openbgpd6/files/patch-src_bgpd_session.h b/net/openbgpd6/files/patch-src_bgpd_session.h
deleted file mode 100644
index 9fbb480caf01..000000000000
--- a/net/openbgpd6/files/patch-src_bgpd_session.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/bgpd/session.h.orig	2020-05-18 19:17:41 UTC
-+++ src/bgpd/session.h
-@@ -18,6 +18,7 @@
- 
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <sys/queue.h>
- #include <time.h>
- 
- #define	MAX_BACKLOG			5
-@@ -146,7 +147,8 @@ struct ctl_conn {
- 	int			terminate;
- };
- 
--TAILQ_HEAD(ctl_conns, ctl_conn)	ctl_conns;
-+TAILQ_HEAD(ctl_conns, ctl_conn);
-+extern struct ctl_conns ctl_conns;
- 
- struct peer_stats {
- 	unsigned long long	 msg_rcvd_open;