diff --git a/security/n2n/Makefile b/security/n2n/Makefile
index 58da491f7093..c0c02eb0234f 100644
--- a/security/n2n/Makefile
+++ b/security/n2n/Makefile
@@ -1,43 +1,47 @@
 # Created by: Babak Farrokhi <farrokhi@FreeBSD.org>
 
 PORTNAME=	n2n
 PORTVERSION=	${PORT_V_MAJOR}.${PORT_V_MINOR}
 CATEGORIES=	security net net-vpn
 
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Layer Two Peer-to-peer VPN
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-GNU_CONFIGURE=	yes
 USES=		autoreconf gmake ssl
+GNU_CONFIGURE=	yes
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORT_V_MAJOR=	2
-PORT_V_MINOR=	6
+PORT_V_MINOR=	8
 PORT_V_PATCH=	0
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ntop
 
 PLIST_FILES=	sbin/edge \
 		sbin/supernode \
 		man/man1/supernode.1.gz \
 		man/man7/n2n.7.gz \
 		man/man8/edge.8.gz
 
+LIB_DEPENDS+=	libzstd.so:archivers/zstd
+
 post-patch:
 	@${SED} -e "s/@N2N_MAJOR@/${PORT_V_MAJOR}/g" \
 		-e "s/@N2N_MINOR@/${PORT_V_MINOR}/g" \
 		-e "s/@N2N_PATCH@/${PORT_V_PATCH}/g" \
 		-e "s/@N2N_VERSION_SHORT@/${PORT_V_MAJOR}.${PORT_V_MINOR}.${PORT_V_PATCH}/g" \
 		${WRKSRC}/configure.seed >${WRKSRC}/configure.ac
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/edge ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/supernode ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/edge.8 ${STAGEDIR}${MANPREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/supernode.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/n2n.7 ${STAGEDIR}${MANPREFIX}/man/man7
 
 .include <bsd.port.mk>
diff --git a/security/n2n/distinfo b/security/n2n/distinfo
index 2b1b66e4d9ea..0413fb23f153 100644
--- a/security/n2n/distinfo
+++ b/security/n2n/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586460913
-SHA256 (ntop-n2n-2.6_GH0.tar.gz) = d08a75cba32394e7077d8b3afdef913d61cdf5911141effb5cd3ee2d79c66bc2
-SIZE (ntop-n2n-2.6_GH0.tar.gz) = 559529
+TIMESTAMP = 1628160276
+SHA256 (ntop-n2n-2.8_GH0.tar.gz) = ad9ab95a79dcf6b412c36489f50de54bb54417b5cea854eb54722b6cb8f0fd04
+SIZE (ntop-n2n-2.8_GH0.tar.gz) = 327114
diff --git a/security/n2n/files/patch-Makefile.in b/security/n2n/files/patch-Makefile.in
deleted file mode 100644
index 4b15f34b59e1..000000000000
--- a/security/n2n/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2020-04-09 19:38:26 UTC
-+++ Makefile.in
-@@ -6,7 +6,7 @@ GIT_COMMITS=@GIT_COMMITS@
- ########
- 
- CC?=gcc
--DEBUG?=-g3
-+#DEBUG?=-g3
- #OPTIMIZATION?=-O2
- WARN?=-Wall
- 
diff --git a/security/n2n/files/patch-tools_Makefile.in b/security/n2n/files/patch-tools_Makefile.in
new file mode 100644
index 000000000000..251f345ce0f1
--- /dev/null
+++ b/security/n2n/files/patch-tools_Makefile.in
@@ -0,0 +1,10 @@
+--- tools/Makefile.in.orig	2021-08-05 10:46:29 UTC
++++ tools/Makefile.in
+@@ -1,5 +1,5 @@
+-CC?=gcc
+-DEBUG?=-g3
++CC?=cc
++DEBUG?=
+ OPTIMIZATION?=-O2 #-march=native
+ WARN?=-Wall
+