diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
index 10cc3a70e5ef..c646564b8d15 100644
--- a/net-im/tox/Makefile
+++ b/net-im/tox/Makefile
@@ -1,68 +1,67 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 
 PORTNAME=	toxcore
-PORTVERSION=	0.2.17
+PORTVERSION=	0.2.18
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	ProjectTox-Core library, a decentralized and secure messenger
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	checkmk:devel/check			\
 		gtest:sysutils/coreutils
 LIB_DEPENDS=	libvpx.so:multimedia/libvpx		\
-		libmsgpackc.so:devel/msgpack		\
 		libsndfile.so:audio/libsndfile		\
 		libportaudio.so:audio/portaudio		\
 		libsodium.so:security/libsodium		\
 		libopus.so:audio/opus			\
 		libconfig.so:devel/libconfig
 TEST_DEPENDS=	opencv_visualisation:graphics/opencv
 #TEST_DEPENDS=	libopencv_core.so:graphics/opencv
 
-CONFLICTS=	toxcore-legacy-0.1.*
-
 USE_GITHUB=	yes
-GH_ACCOUNT=	TokTok
-GH_PROJECT=	c-toxcore
+GH_ACCOUNT=	TokTok camgunz:cmp
+GH_PROJECT=	c-toxcore cmp:cmp
+GH_TAGNAME=	4c3737d1a172ee74d2b35b5fd6865d1fe9dac7af:cmp
+GH_SUBDIR=	third_party/cmp:cmp
 
 CPE_VENDOR=	toktok
 
 USES=		cmake compiler:c11 cpe libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 PLIST_SUB=	VER=${PORTVERSION:C/0.//}.0 SO=2
 
 OPTIONS_DEFINE=		DAEMON TEST
 OPTIONS_SUB=		yes
 
 DAEMON_DESC=		Bootstrap daemon
 DAEMON_CMAKE_ON=	-DBOOTSTRAP_DAEMON=on
 DAEMON_LIB_DEPENDS=	libconfig.so:devel/libconfig
 
 TEST_CMAKE_ON=		-DAUTOTEST=on
 TEST_TARGET=		test
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDAEMON}
 USERS=		toxdht
 USE_RC_SUBR=	tox-bootstrapd
 SUB_LIST=	TOXDHT=${USERS}
 PLIST_SUB+=	TOXDHT=${USERS}
 KEYS_DIR=	/var/lib/tox-bootstrapd
 PID_DIR=	/var/run/tox-bootstrapd
 PKGMESSAGE=	${PKGDIR}/pkg-message.daemon
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDAEMON}
 	${INSTALL_DATA} ${WRKSRC}/other/bootstrap_daemon/tox-bootstrapd.conf	\
 		${STAGEDIR}${PREFIX}/etc/tox-bootstrapd.conf.sample
 	${MKDIR} ${STAGEDIR}${KEYS_DIR}
 	${MKDIR} ${STAGEDIR}${PID_DIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-im/tox/distinfo b/net-im/tox/distinfo
index bb4af6a4ef06..d3b2bdf7edfa 100644
--- a/net-im/tox/distinfo
+++ b/net-im/tox/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1646598591
-SHA256 (TokTok-c-toxcore-v0.2.17_GH0.tar.gz) = d9cdf5d690fe8e217dcaba5b988fb943bbe7bda919a2fde6d9506df047e5f4cb
-SIZE (TokTok-c-toxcore-v0.2.17_GH0.tar.gz) = 560639
+TIMESTAMP = 1650443954
+SHA256 (TokTok-c-toxcore-v0.2.18_GH0.tar.gz) = 1fba883638fd18985fd41acd35fed198c2cdd6e91651eb1c3fe602b610b535fe
+SIZE (TokTok-c-toxcore-v0.2.18_GH0.tar.gz) = 613087
+SHA256 (camgunz-cmp-4c3737d1a172ee74d2b35b5fd6865d1fe9dac7af_GH0.tar.gz) = a13a479f747854b990cee074cdc7a7309ec6e025059b7213b9ca311860de1b02
+SIZE (camgunz-cmp-4c3737d1a172ee74d2b35b5fd6865d1fe9dac7af_GH0.tar.gz) = 40334
diff --git a/net-im/tox/files/patch-toxcore_network.c b/net-im/tox/files/patch-toxcore_network.c
new file mode 100644
index 000000000000..eda52d4414f8
--- /dev/null
+++ b/net-im/tox/files/patch-toxcore_network.c
@@ -0,0 +1,18 @@
+--- toxcore/network.c.orig	2022-04-18 18:12:07 UTC
++++ toxcore/network.c
+@@ -1063,6 +1063,7 @@ Networking_Core *new_networking_ex(
+      */
+     int n = 1024 * 1024 * 2;
+ 
++#if !defined(__FreeBSD__)
+     if (net_setsockopt(ns, temp->sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof(n)) != 0) {
+         LOGGER_ERROR(log, "failed to set socket option %d", SO_RCVBUF);
+     }
+@@ -1070,6 +1071,7 @@ Networking_Core *new_networking_ex(
+     if (net_setsockopt(ns, temp->sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof(n)) != 0) {
+         LOGGER_ERROR(log, "failed to set socket option %d", SO_SNDBUF);
+     }
++#endif
+ 
+     /* Enable broadcast on socket */
+     int broadcast = 1;