diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile
index 04e787391ffc..3a2493968840 100644
--- a/net-im/qTox/Makefile
+++ b/net-im/qTox/Makefile
@@ -1,96 +1,98 @@
 PORTNAME=	qTox
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.17.6
-PORTREVISION=	7
+DISTVERSION=	1.18.1
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	yuri@FreeBSD.org
-COMMENT=	Qt 5 based Tox client
-WWW=		https://qtox.github.io/
+COMMENT=	Qt based Tox client
+WWW=		https://qtox.github.io/ \
+		https://github.com/TokTok/qTox
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libexif.so:graphics/libexif \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libopus.so:audio/opus \
 		libqrencode.so:graphics/libqrencode \
 		libsodium.so:security/libsodium \
 		libsqlcipher.so:databases/sqlcipher \
 		libtox_extension_messages.so:net-im/tox_extension_messages \
 		libtoxcore.so:net-im/tox \
 		libtoxext.so:net-im/toxext \
 		libvpx.so:multimedia/libvpx
 
-USES=		cmake compiler:c++11-lib desktop-file-utils gettext openal:soft pkgconfig qt:5
+USES=		cmake compiler:c++11-lib desktop-file-utils gettext gl openal:soft pkgconfig qt:6
+USE_GL=		opengl
+USE_QT=		base sqldriver-sqlite:run svg
+
 USE_GITHUB=	yes
-USE_QT=		core gui network xml opengl sql sql-sqlite3:run widgets svg \
-		concurrent:build buildtools:build linguisttools:build qmake:build testlib:build
+GH_ACCOUNT=	TokTok
 
 CMAKE_ARGS=	-DGIT_DESCRIBE:STRING=${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 CMAKE_OFF=	USE_CCACHE
 
 OPTIONS_DEFINE=			FILTERAUDIO PLATFORM_EXTENSIONS SPELL_CHECK APPINDICATOR GTK_SYSTRAY STATUSNOTIFIER
 OPTIONS_DEFAULT=		FILTERAUDIO PLATFORM_EXTENSIONS SPELL_CHECK GTK_SYSTRAY STATUSNOTIFIER # removing GTK_SYSTRAY, STATUSNOTIFIER doesn't reduce dependencies
 
 FILTERAUDIO_DESC=		Enable the echo canceling backend
 FILTERAUDIO_CMAKE_BOOL=		USE_FILTERAUDIO
 FILTERAUDIO_LIB_DEPENDS=	libfilteraudio.so:audio/libfilteraudio
 
 PLATFORM_EXTENSIONS_DESC=	Enable platform specific extensions
 PLATFORM_EXTENSIONS_CMAKE_BOOL=	PLATFORM_EXTENSIONS
 PLATFORM_EXTENSIONS_USES=	xorg
 PLATFORM_EXTENSIONS_USE=	XORG=x11,xscrnsaver
 
 SPELL_CHECK_DESC=	Spell checking support
-SPELL_CHECK_USES=	kde:5
+SPELL_CHECK_USES=	kde:6
 SPELL_CHECK_USE=	KDE=sonnet
 SPELL_CHECK_CMAKE_BOOL=	SPELL_CHECK
 
 APPINDICATOR_CMAKE_BOOL=	ENABLE_APPINDICATOR
 APPINDICATOR_BROKEN=	can not find appindicator-0.1
 
 GTK_SYSTRAY_DESC=	Enable GTK systray
 GTK_SYSTRAY_CMAKE_BOOL=	ENABLE_GTK_SYSTRAY
 GTK_SYSTRAY_USES=	gnome
 GTK_SYSTRAY_USE=	GNOME=atk,cairo,gdkpixbuf2,gtk20
 
 STATUSNOTIFIER_DESC=	Enable status notifier
 STATUSNOTIFIER_CMAKE_BOOL=	ENABLE_STATUSNOTIFIER
 STATUSNOTIFIER_USES=	gnome
 STATUSNOTIFIER_USE=	GNOME=atk,cairo,gdkpixbuf2,gtk20
 
 PLIST_FILES=	bin/qtox \
 		share/applications/io.github.qtox.qTox.desktop \
 		share/icons/hicolor/scalable/apps/qtox.svgz \
 		share/metainfo/io.github.qtox.qTox.appdata.xml
 .for SZ in 14 16 22 24 32 36 48 64 72 96 128 192 256 512
 PLIST_FILES+=	share/icons/hicolor/${SZ}x${SZ}/apps/qtox.png
 .endfor
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == "gcc" && ${ARCH} == i386 && !${CFLAGS:M-march=*}
 # Needed for __atomic_fetch_add_8
 CFLAGS+=	-march=i586
 .endif
 
 .if !defined(DISTVERSIONSUFFIX)
 FULLVERSION=	${PKGVERSION}
 .else
 FULLVERSION=	"${PKGVERSION} (rev.${DISTVERSIONSUFFIX:S/-g//})"
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Warning: qTox won't build if the option NaCl was selected for Tox!"
 	@${ECHO_MSG}
 
 pre-configure:
 	@${REINPLACE_CMD} '/Comment/s,=.*,=${COMMENT},' \
 		${WRKSRC}/io.github.qtox.qTox.desktop
 
 .include <bsd.port.post.mk>
diff --git a/net-im/qTox/distinfo b/net-im/qTox/distinfo
index 1b0724b65682..6d40169fcafe 100644
--- a/net-im/qTox/distinfo
+++ b/net-im/qTox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646771982
-SHA256 (qTox-qTox-v1.17.6_GH0.tar.gz) = cd0781241b4ea536da90ce8c72ad9f2aa9bbdf9fbae5d38ee645e30d790fa7f2
-SIZE (qTox-qTox-v1.17.6_GH0.tar.gz) = 4823784
+TIMESTAMP = 1736128301
+SHA256 (TokTok-qTox-v1.18.1_GH0.tar.gz) = 80c73bf899ea0172aaab862225cda668064ec781cfa33cb199c3c3b33cbb2d9e
+SIZE (TokTok-qTox-v1.18.1_GH0.tar.gz) = 5304686
diff --git a/net-im/qTox/pkg-descr b/net-im/qTox/pkg-descr
index ddcad24dfea1..36962cc47209 100644
--- a/net-im/qTox/pkg-descr
+++ b/net-im/qTox/pkg-descr
@@ -1,2 +1,2 @@
-Powerful Tox chat client written using Qt 5 that follows the Tox
+Powerful Tox chat client written using Qt that follows the Tox
 design guidelines.
diff --git a/net-im/qTox/pkg-message b/net-im/qTox/pkg-message
index 9e8025a6f8c3..82193985ace3 100644
--- a/net-im/qTox/pkg-message
+++ b/net-im/qTox/pkg-message
@@ -1,20 +1,20 @@
 [
 { type: install
   message: <<EOM
-You installed qTox: Qt 5 based Tox client.
+You installed qTox: Qt based Tox client.
 
 To have video working, you need:
 1. Have multimedia/webcamd installed and running. The usual way to
    start webcamd is to have these two lines in /etc/rc.conf:
    webcamd_enable="YES"
    webcamd_flags="-H"
 2. Make sure V4L option is "on" in multimedia/ffmpeg.
 
 To have spell checking working, you need:
 1. Have the locale set, for example have LANG=en_US.UTF-8 set in the
    environment.
 2. Have some dictionary installed that is supported by KDE sonnet,
    for example en-hunspell.
 EOM
 }
 ]