diff --git a/net-libs/tox/patches/tox-0.2.12.patchset b/net-libs/tox/patches/tox-0.2.18.patchset
similarity index 86%
rename from net-libs/tox/patches/tox-0.2.12.patchset
rename to net-libs/tox/patches/tox-0.2.18.patchset
index ea8ce58e3..5335aa8c5 100644
--- a/net-libs/tox/patches/tox-0.2.12.patchset
+++ b/net-libs/tox/patches/tox-0.2.18.patchset
@@ -1,11 +1,11 @@
-From adda5fd7edb90e54c52e96d74dc4d5523e85371e Mon Sep 17 00:00:00 2001
+From bf1bcf205099592e3f1298bc9496c2f96219ee60 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Fri, 24 Mar 2023 13:12:39 +0100
 Subject: Haiku: find libnetwork
 
 
 diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index 8361e8e..d6062ab 100644
+index fb49944..7eeb3cc 100644
 --- a/cmake/Dependencies.cmake
 +++ b/cmake/Dependencies.cmake
 @@ -11,6 +11,7 @@ find_package(Threads REQUIRED)
diff --git a/net-libs/tox/tox-0.2.12.recipe b/net-libs/tox/tox-0.2.18.recipe
similarity index 84%
rename from net-libs/tox/tox-0.2.12.recipe
rename to net-libs/tox/tox-0.2.18.recipe
index a13092dbb..542396f81 100644
--- a/net-libs/tox/tox-0.2.12.recipe
+++ b/net-libs/tox/tox-0.2.18.recipe
@@ -5,12 +5,16 @@ network library with a focus on personal communications.
 It's a VERY secure Instant Messenger that supports Text, Audio/Video calls, \
 group chats, audio group chats, and file transfers."
 HOMEPAGE="https://tox.chat/"
-COPYRIGHT="2013-2017 Tox Project"
-LICENSE="GNU GPL v3"
-REVISION="2"
+COPYRIGHT="2013-2022 Tox Project"
+LICENSE="GNU GPL v3
+	MIT"
+REVISION="1"
 SOURCE_URI="https://github.com/TokTok/c-toxcore/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="30ae3263c9b68d3bef06f799ba9d7a67e3fad447030625f0ffa4bb22684228b0"
+CHECKSUM_SHA256="1fba883638fd18985fd41acd35fed198c2cdd6e91651eb1c3fe602b610b535fe"
 SOURCE_DIR="c-toxcore-$portVersion"
+srcGitRev2="e836703291392aba9db92b46fb47929521fac71f"
+SOURCE_URI_2="https://github.com/camgunz/cmp/archive/$srcGitRev2.tar.gz"
+CHECKSUM_SHA256_2="791ed2eaae05d75a6ef1c3fcad4edd595aba80a0be050067ec147d1cd94ec13a"
 PATCHES="tox-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -72,6 +76,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
+	cp -r $sourceDir2/cmp-$srcGitRev2/* third_party/cmp
 	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
 		-DCMAKE_INSTALL_BINDIR=$commandBinDir \