diff --git a/chat/toxcore/Makefile b/chat/toxcore/Makefile
index d5c175c81699..7082b7b05a46 100644
--- a/chat/toxcore/Makefile
+++ b/chat/toxcore/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2020/03/15 13:44:04 mef Exp $
+# $NetBSD: Makefile,v 1.4 2023/04/30 15:03:22 nikita Exp $
 
-DISTNAME=	toxcore-0.2.10
+DISTNAME=	toxcore-0.2.18
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GITHUB:=TokTok/}
 GITHUB_PROJECT=	c-toxcore
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
+GITHUB_SUBMODULES=	camgunz cmp v20 third_party/cmp
+
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://tox.chat/
 COMMENT=	Tox protocol library
diff --git a/chat/toxcore/PLIST b/chat/toxcore/PLIST
index 8b4169e8bd56..f0a5e4f04898 100644
--- a/chat/toxcore/PLIST
+++ b/chat/toxcore/PLIST
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2020/03/15 13:44:04 mef Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/04/30 15:03:22 nikita Exp $
 bin/DHT_bootstrap
 bin/tox-bootstrapd
 include/tox/tox.h
+include/tox/tox_dispatch.h
+include/tox/tox_events.h
 include/tox/toxav.h
 include/tox/toxencryptsave.h
 lib/libtoxcore.a
 lib/libtoxcore.so
 lib/libtoxcore.so.2
-lib/libtoxcore.so.2.10.0
+lib/libtoxcore.so.2.18.0
 lib/pkgconfig/toxcore.pc
+share/bash-completion/completions/tox-bootstrapd
diff --git a/chat/toxcore/buildlink3.mk b/chat/toxcore/buildlink3.mk
index 51cc25e4cd19..79572ae2f62f 100644
--- a/chat/toxcore/buildlink3.mk
+++ b/chat/toxcore/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/03/15 14:03:44 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2023/04/30 15:03:22 nikita Exp $
 
 BUILDLINK_TREE+=	toxcore
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	toxcore
 TOXCORE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.toxcore+=	toxcore>=0.2.4
-BUILDLINK_ABI_DEPENDS.toxcore?=	toxcore>=0.2.10nb1
+BUILDLINK_ABI_DEPENDS.toxcore+=	toxcore>=0.2.10nb1
 BUILDLINK_PKGSRCDIR.toxcore?=	../../chat/toxcore
 
 .include "../../audio/libopus/buildlink3.mk"
diff --git a/chat/toxcore/distinfo b/chat/toxcore/distinfo
index c54d8411e3b5..94369e853ba9 100644
--- a/chat/toxcore/distinfo
+++ b/chat/toxcore/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:05:28 nia Exp $
+$NetBSD: distinfo,v 1.6 2023/04/30 15:03:22 nikita Exp $
 
-BLAKE2s (toxcore-0.2.10.tar.gz) = ab56bd9dcdeb517aa38d1be405deff6f81e4a5b3f38a7b988f7f6cd87aebb57a
-SHA512 (toxcore-0.2.10.tar.gz) = 8a6a78c52a67be0b727d0d3a8d1cece20ad716a2e694df0aa747eee7764f64c957458584f59db5e727a9803ed7b21adc1ad8d7e80fd6651e7774ca3504b38fc7
-Size (toxcore-0.2.10.tar.gz) = 515842 bytes
+BLAKE2s (camgunz-cmp-v20.tar.gz) = a5160868b63f1a24bfa217d1b8a3480999ef5d6c90bb1feee84a7a096e03941c
+SHA512 (camgunz-cmp-v20.tar.gz) = f747cb9672592d8c06d08786152a0bfbd6ae4d759d7006805913781c502bf3796241ade636ce2cf9c049f68dd2899e2d5d7008815f29c1a91fc797590a26a9fd
+Size (camgunz-cmp-v20.tar.gz) = 40252 bytes
+BLAKE2s (toxcore-0.2.18.tar.gz) = 7e15b5b59f77b502c4513df8292c4b738c86b3ec63e79cfcbae07732e3cc00f5
+SHA512 (toxcore-0.2.18.tar.gz) = 4bd8e90f395e7c8455b3e31bba0e72bb96a9fab2cbf0e3c2950a7f4b7fcaf8f250ef38fa30ba58a5a79d4cf2a4b5470e6c642597198bb7a7f711f28bbd13d65c
+Size (toxcore-0.2.18.tar.gz) = 613087 bytes