diff --git a/security/fwknop/Makefile b/security/fwknop/Makefile
index a6e01b4db9b1..5ba13dae2a08 100644
--- a/security/fwknop/Makefile
+++ b/security/fwknop/Makefile
@@ -1,57 +1,54 @@
 # Created by: Sean Greven <sean.greven@gmail.com>
 
 PORTNAME=	fwknop
 PORTVERSION=	2.6.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.cipherdyne.org/fwknop/download/
 
 MAINTAINER=	sean.greven@gmail.com
 COMMENT=	SPA implementation for Linux and FreeBSD
 
 LICENSE=	GPLv2
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: log_level_t
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: log_level_t
-
 BUILD_DEPENDS= wget:ftp/wget
 RUN_DEPENDS=   wget:ftp/wget
 LIB_DEPENDS+=  libassuan.so:security/libassuan
 
 USES=		cpe libtool
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	fwknopd
 
 CPE_VENDOR=	cipherdyne
 CONFLICTS_BUILD=	fwknop-2.6.8_*
 
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 INFO=		libfko
 
 OPTIONS_DEFINE=	GPGME
 
 OPTIONS_SINGLE=	FW
 OPTIONS_SINGLE_FW=	IPFW PF
 
 OPTIONS_DEFAULT=	GPGME IPFW
 
 FW_DESC=	Firewall Backend
 IPFW_DESC=	Use the IPFW firewall
 PF_DESC=	Use the PF firewall.
 GPGME_DESC=	Build support for gpgme
 
 IPFW_CONFIGURE_WITH=	ipfw=/sbin/ipfw
 
 PF_CONFIGURE_WITH=	pf=/sbin/pfctl
 
 GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
 GPGME_LIB_DEPENDS+=	libgpg-error.so:security/libgpg-error
 GPGME_CONFIGURE_WITH=	gpgme
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX}/etc/fwknop && ${MV} access.conf access.conf.sample)
 	(cd ${STAGEDIR}${PREFIX}/etc/fwknop && ${MV} fwknopd.conf fwknopd.conf.sample)
 
 .include <bsd.port.mk>
diff --git a/security/fwknop/files/patch-client_log__msg.h b/security/fwknop/files/patch-client_log__msg.h
new file mode 100644
index 000000000000..d1d61a6e6681
--- /dev/null
+++ b/security/fwknop/files/patch-client_log__msg.h
@@ -0,0 +1,19 @@
+*** client/log_msg.h.orig	Sat Apr  3 21:59:58 2021
+--- client/log_msg.h	Sat Apr  3 22:00:14 2021
+***************
+*** 38,44 ****
+      LOG_VERBOSITY_INFO,         /*!< Constant to define a INFO message */
+      LOG_VERBOSITY_DEBUG,        /*!< Constant to define a DEBUG message */
+      LOG_LAST_VERBOSITY
+! } log_level_t;
+
+  #define LOG_DEFAULT_VERBOSITY   LOG_VERBOSITY_NORMAL    /*!< Default verbosity to use */
+
+--- 38,44 ----
+      LOG_VERBOSITY_INFO,         /*!< Constant to define a INFO message */
+      LOG_VERBOSITY_DEBUG,        /*!< Constant to define a DEBUG message */
+      LOG_LAST_VERBOSITY
+! };
+
+  #define LOG_DEFAULT_VERBOSITY   LOG_VERBOSITY_NORMAL    /*!< Default verbosity to use */
+