diff --git a/net-im/nheko/Makefile b/net-im/nheko/Makefile
index ab0e3ded4a1d..b743e1143248 100644
--- a/net-im/nheko/Makefile
+++ b/net-im/nheko/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	nheko
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.3
 PORTREVISION=	3
 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 \
 		libfmt.so:devel/libfmt \
 		liblmdb.so:databases/lmdb \
 		libmatrix_client.so:net-im/mtxclient \
 		libolm.so:security/olm \
 		libqt5keychain.so:security/qtkeychain@qt5 \
 		libspdlog.so:devel/spdlog
 
 USES=		cmake compiler:c++17-lang desktop-file-utils \
 		localbase:ldflags pkgconfig qt:5 ssl tar:xz
 USE_QT=		concurrent core dbus declarative gui multimedia network \
 		quickcontrols2 svg widgets \
 		graphicaleffects:run \
 		buildtools:build linguist:build qmake: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 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
 
 .include <bsd.port.mk>
diff --git a/net-im/nheko/files/patch-libfmt b/net-im/nheko/files/patch-libfmt
new file mode 100644
index 000000000000..3b6e5fe2c0aa
--- /dev/null
+++ b/net-im/nheko/files/patch-libfmt
@@ -0,0 +1,71 @@
+Obtained from:	https://nheko.im/nheko-reborn/nheko/-/commit/e89e65dc17020772eb057414b4f0c5d6f4ad98d0
+		https://nheko.im/nheko-reborn/nheko/-/commit/871e403f6799df48cfbbe08eba56d473a0c34216
+
+--- src/Cache.cpp.orig	2023-02-22 23:50:45 UTC
++++ src/Cache.cpp
+@@ -438,7 +438,7 @@ Cache::loadSecretsFromStore(
+                 if (job->error() && job->error() != QKeychain::Error::EntryNotFound) {
+                     nhlog::db()->error("Restoring secret '{}' failed ({}): {}",
+                                        name.toStdString(),
+-                                       job->error(),
++                                       static_cast<int>(job->error()),
+                                        job->errorString().toStdString());
+ 
+                     fatalSecretError();
+--- src/ChatPage.cpp.orig	2023-02-22 23:50:45 UTC
++++ src/ChatPage.cpp
+@@ -1248,7 +1248,7 @@ ChatPage::getBackupVersion()
+                       nhlog::crypto()->info("Our backup key {} does not match the one "
+                                             "used in the online backup {}",
+                                             pubkey,
+-                                            auth_data["public_key"]);
++                                            auth_data["public_key"].get<std::string>());
+                       cache::client()->deleteBackupVersion();
+                       return;
+                   }
+--- src/encryption/DeviceVerificationFlow.cpp.orig	2023-02-22 23:50:45 UTC
++++ src/encryption/DeviceVerificationFlow.cpp
+@@ -39,7 +39,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject
+   , deviceIds(std::move(deviceIds_))
+   , model_(model)
+ {
+-    nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", flow_type, (void *)this);
++    nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", static_cast<int>(flow_type), (void *)this);
+     if (deviceIds.size() == 1)
+         deviceId = deviceIds.front();
+ 
+--- src/timeline/InputBar.cpp.orig	2023-02-22 23:50:45 UTC
++++ src/timeline/InputBar.cpp
+@@ -948,14 +948,14 @@ MediaUpload::MediaUpload(std::unique_ptr<QIODevice> so
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(error),
+                                        mediaPlayer->errorString().toStdString());
+                 });
+         connect(mediaPlayer,
+                 &QMediaPlayer::mediaStatusChanged,
+                 [mediaPlayer](QMediaPlayer::MediaStatus status) {
+                     nhlog::ui()->debug(
+-                      "Media player status {} and error {}", status, mediaPlayer->error());
++                      "Media player status {} and error {}", static_cast<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&QMediaPlayer::metaDataChanged),
+--- src/ui/MxcMediaProxy.cpp.orig	2023-02-22 23:50:45 UTC
++++ src/ui/MxcMediaProxy.cpp
+@@ -37,11 +37,11 @@ MxcMediaProxy::MxcMediaProxy(QObject *parent)
+             qOverload<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(error),
+                                   this->errorString().toStdString());
+             });
+     connect(this, &MxcMediaProxy::mediaStatusChanged, [this](QMediaPlayer::MediaStatus status) {
+-        nhlog::ui()->info("Media player status {} and error {}", status, this->error());
++        nhlog::ui()->info("Media player status {} and error {}", static_cast<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&MxcMediaProxy::metaDataChanged),