diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
index 1b4e303edfa6..6153f4692a89 100644
--- a/net-im/tox/Makefile
+++ b/net-im/tox/Makefile
@@ -1,63 +1,64 @@
 PORTNAME=	toxcore
-DISTVERSION=	0.2.20
-PORTREVISION=	2
+DISTVERSION=	0.2.21
 PORTEPOCH=	1
 CATEGORIES=	net-im net-p2p
 MASTER_SITES=	https://github.com/TokTok/c-${PORTNAME}/releases/download/v${DISTVERSION}/
-DISTNAME=	c-${PORTNAME}-${DISTVERSION}
+DISTNAME=	c-${PORTNAME}-v${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	ProjectTox-Core library, a decentralized and secure messenger
-WWW=		https://tox.chat/
+WWW=		https://tox.chat/ \
+		https://github.com/TokTok/c-toxcore/
 
 LICENSE=	GPLv3
-LICENSE_FILES=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopus.so:audio/opus \
-		libsodium.so:security/libsodium	\
+		libsodium.so:security/libsodium \
 		libvpx.so:multimedia/libvpx
 TEST_DEPENDS=	googletest>0:devel/googletest
 
-USES=		cmake:testing compiler:c++17-lang cpe pathfix pkgconfig
+USES=		cmake:testing compiler:c++17-lang cpe pathfix pkgconfig tar:xz
 CPE_VENDOR=	toktok
 PATHFIX_CMAKELISTSTXT=	ModulePackage.cmake
 USE_LDCONFIG=	yes
 
-PLIST_SUB=	VER=${DISTVERSION:C/0.//}.0 SO=2
-
-CMAKE_TESTING_OFF=	CMAKE_DISABLE_FIND_PACKAGE_GTest
+CMAKE_OFF=	CMAKE_DISABLE_FIND_PACKAGE_GTest \
+		UNITTEST
 CMAKE_TESTING_ON=	UNITTEST
+CMAKE_TESTING_OFF=	CMAKE_DISABLE_FIND_PACKAGE_GTest
 # AUTOTEST(s) are broken...
 
-CMAKE_OFF=	CMAKE_DISABLE_FIND_PACKAGE_GTest \
-		UNITTEST
+NO_WRKSUBDIR=	yes
+
+PLIST_SUB=	VER=${DISTVERSION:C/0.//}.0 SO=2
 
 OPTIONS_DEFINE=	DAEMON
 OPTIONS_SUB=	yes
 
 DAEMON_DESC=	Bootstrap daemon
 
 DAEMON_LIB_DEPENDS=	libconfig.so:devel/libconfig
 DAEMON_CMAKE_BOOL=	BOOTSTRAP_DAEMON
 
 .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	\
+	${INSTALL_DATA} ${WRKSRC}/other/bootstrap_daemon/tox-bootstrapd.conf \
 		${STAGEDIR}${PREFIX}/etc/tox-bootstrapd.conf.sample
-	${MKDIR} ${STAGEDIR}${KEYS_DIR}
-	${MKDIR} ${STAGEDIR}${PID_DIR}
+	${MKDIR} ${STAGEDIR}${KEYS_DIR} \
+		 ${STAGEDIR}${PID_DIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-im/tox/distinfo b/net-im/tox/distinfo
index febef1b55966..9a5c25aa7456 100644
--- a/net-im/tox/distinfo
+++ b/net-im/tox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737201354
-SHA256 (c-toxcore-0.2.20.tar.gz) = a9c89a8daea745d53e5d78e7aacb99c7b4792c4400a5a69c71238f45d6164f4c
-SIZE (c-toxcore-0.2.20.tar.gz) = 862660
+TIMESTAMP = 1762500000
+SHA256 (c-toxcore-v0.2.21.tar.xz) = dde19a5eaa897f3b9ca6212e783a08753ad5c071deb14a73d84161853a067234
+SIZE (c-toxcore-v0.2.21.tar.xz) = 906700
diff --git a/net-im/tox/files/patch-toxcore_network.c b/net-im/tox/files/patch-toxcore_network.c
index eda52d4414f8..4759446df1d7 100644
--- a/net-im/tox/files/patch-toxcore_network.c
+++ b/net-im/tox/files/patch-toxcore_network.c
@@ -1,18 +1,18 @@
---- toxcore/network.c.orig	2022-04-18 18:12:07 UTC
+--- toxcore/network.c.orig	2025-10-06 10:37:58 UTC
 +++ toxcore/network.c
-@@ -1063,6 +1063,7 @@ Networking_Core *new_networking_ex(
+@@ -1318,6 +1318,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);
+         LOGGER_WARNING(log, "failed to set socket option %d", SO_RCVBUF);
      }
-@@ -1070,6 +1071,7 @@ Networking_Core *new_networking_ex(
+@@ -1325,6 +1326,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);
+         LOGGER_WARNING(log, "failed to set socket option %d", SO_SNDBUF);
      }
 +#endif
  
      /* Enable broadcast on socket */
      int broadcast = 1;
diff --git a/net-im/tox/pkg-plist b/net-im/tox/pkg-plist
index faafb5ee44a4..77376aac0531 100644
--- a/net-im/tox/pkg-plist
+++ b/net-im/tox/pkg-plist
@@ -1,17 +1,17 @@
 %%DAEMON%%bin/DHT_bootstrap
 %%DAEMON%%bin/tox-bootstrapd
 %%DAEMON%%@sample etc/tox-bootstrapd.conf.sample
-include/tox/tox_dispatch.h
-include/tox/tox_events.h
 include/tox/tox.h
+include/tox/tox_log_level.h
+include/tox/tox_options.h
 include/tox/toxav.h
 include/tox/toxencryptsave.h
 lib/libtoxcore.a
 lib/libtoxcore.so
 lib/libtoxcore.so.%%SO%%
 lib/libtoxcore.so.%%VER%%
 libdata/pkgconfig/toxcore.pc
 %%DAEMON%%share/bash-completion/completions/tox-bootstrapd
 %%DAEMON%%@dir(%%TOXDHT%%,nobody,755) /var/run/tox-bootstrapd
 %%DAEMON%%@dir(%%TOXDHT%%,nobody,700) /var/lib/tox-bootstrapd
 %%DAEMON%%@dir /var/lib