diff --git a/net-im/nheko/Makefile b/net-im/nheko/Makefile
index d0588df2b23f..cd356311216f 100644
--- a/net-im/nheko/Makefile
+++ b/net-im/nheko/Makefile
@@ -1,54 +1,56 @@
 PORTNAME=	nheko
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.12.0
 CATEGORIES=	net-im
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Matrix IM client based on Qt technologies
 WWW=		https://nheko.im/nheko-reborn/nheko/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	nlohmann-json>=3:devel/nlohmann-json \
 		asciidoc>=10:textproc/asciidoc
 # All those boost-libs are pulled in through mtxclient, which
 # links to them but stage-qa still complains.
 LIB_DEPENDS=	\
 		libcmark.so:textproc/cmark \
 		libcoeurl.so:ftp/coeurl \
 		libkdsingleapplication-qt6.so:devel/kdsingleapplication \
 		libfmt.so:devel/libfmt \
 		libspdlog.so:devel/spdlog \
 		liblmdb.so:databases/lmdb \
 		libmatrix_client.so:net-im/mtxclient \
 		libolm.so:security/olm \
 		libqt6keychain.so:security/qtkeychain@qt6
 
 USES=		cmake compiler:c++20-lang desktop-file-utils \
 		localbase:ldflags pkgconfig qt:6 ssl tar:xz
+USE_GITHUB=	yes
+GH_ACCOUNT=	Nheko-Reborn
+GH_TUPLE=	hoytech:lmdbxx:029fb681213af3020f5e3a86045445552bd024c5:lmdb/deps/lmdb
 USE_QT=		base declarative multimedia \
 		svg \
 		tools:build translations:build
 
-OPTIONS_DEFINE=	VOIP
-OPTIONS_DEFAULT=
-
-VOIP_DESC=	Enable VOIP calls (experimental)
-VOIP_CMAKE_BOOL=	VOIP
-VOIP_USES=	gstreamer gettext-runtime xorg gnome
-VOIP_USE=	gstreamer=bad,dtls,srtp,webrtc xorg=xcb gnome=glib20
-VOIP_LIB_DEPENDS=	libnice.so:net-im/libnice
-
 # There is one external dependency: lmdb++
 #  - lmdb++ is a single header file, it just needs to be included
 CMAKE_ARGS=	-DLMDBXX_INCLUDE_DIR=${WRKSRC}/deps/lmdb \
 		-DCMAKE_INSTALL_MANDIR=share/man
 CFLAGS+=	-DSPDLOG_FMT_EXTERNAL=1
 LDFLAGS+=	-L${LOCALBASE}/lib -lfmt
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	Nheko-Reborn
-GH_TUPLE=	hoytech:lmdbxx:029fb681213af3020f5e3a86045445552bd024c5:lmdb/deps/lmdb
+PATCH_STRIP=	-p1
+
+OPTIONS_DEFINE=	VOIP
+OPTIONS_DEFAULT=
+
+VOIP_DESC=	Enable VOIP calls (experimental)
+VOIP_LIB_DEPENDS=	libnice.so:net-im/libnice
+VOIP_USES=	gstreamer gettext-runtime xorg gnome
+VOIP_USE=	gstreamer=bad,dtls,srtp,webrtc xorg=xcb gnome=glib20
+VOIP_CMAKE_BOOL=	VOIP
+
 
 .include <bsd.port.mk>
diff --git a/net-im/nheko/files/patch-git-g8ff2824527 b/net-im/nheko/files/patch-git-g8ff2824527
new file mode 100644
index 000000000000..a70f007e77b4
--- /dev/null
+++ b/net-im/nheko/files/patch-git-g8ff2824527
@@ -0,0 +1,37 @@
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1bb..562d2c82a 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+ 
+ #include <set>
+ 
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f44..99d337c4d 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+ 
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+ 
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0e..0757d88cb 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+ 
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+ 
+ #include "Cache.h"