diff --git a/net-im/neochat/Makefile b/net-im/neochat/Makefile
index 722297cc3ec1..df345178aa6b 100644
--- a/net-im/neochat/Makefile
+++ b/net-im/neochat/Makefile
@@ -1,48 +1,51 @@
 PORTNAME=	neochat
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net-im deskutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Glossy Matrix IM client based on KDE technologies
 WWW=		https://invent.kde.org/network/neochat
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-3.0-only.txt
 
 LIB_DEPENDS=	libcmark.so:textproc/cmark \
-		libqt5keychain.so:security/qtkeychain@qt5
-BUILD_DEPENDS=	libquotient>=0.6.11:net-im/libquotient \
+		libqt5keychain.so:security/qtkeychain@qt5 \
+		libolm.so:security/olm
+BUILD_DEPENDS=	libquotient>=0.8:net-im/libquotient \
 		kquickimageeditor>=0.2.0:graphics/kquickimageeditor \
 		kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons \
 		${LOCALBASE}/include/qcoro5/qcoro/qcoro.h:devel/qcoro@qt5
 # Quotient is a static lib, doesn't need to be in RUN_DEPENDS
 RUN_DEPENDS=	kquickimageeditor>=0.2.0:graphics/kquickimageeditor \
 		kirigami-addons>=0.6.1:x11-toolkits/kirigami-addons
 
-USES=		cmake desktop-file-utils gl kde:5 pkgconfig qt:5 tar:xz
+USES=		cmake compiler:c++20-lang desktop-file-utils gl kde:5 \
+		pkgconfig qt:5 tar:xz
 USE_GL=		gl
 USE_QT=		concurrent core dbus declarative graphicaleffects gui imageformats \
 		multimedia network quickcontrols quickcontrols2 \
-		svg widgets xml \
+		sql svg widgets xml \
 		buildtools:build linguist:build qmake:build
 USE_KDE=	auth codecs completion config configwidgets coreaddons dbusaddons \
 		i18n itemmodels jobwidgets kio kirigami2 service solid sonnet \
 		syntaxhighlighting notifications qqc2-desktop-style \
 		widgetsaddons windowsystem \
 		ecm:build
 USE_XORG=	x11
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc*}
 CXX=		clang++${LLVM_VERSION}
 USES+=		llvm:min=16
-.else
+.elif ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
 # Work around compiler bug, see pr: 272285
 USES+=		llvm
-CC=		${LLVM_PREFIX}/bin/clang
-CPP=		${LLVM_PREFIX}/bin/clang-cpp
-CXX=		${LLVM_PREFIX}/bin/clang++
+CC=		clang${LLVM_VERSION}
+CPP=		clang-cpp${LLVM_VERSION}
+CXX=		clang++${LLVM_VERSION}
 .endif
 
 .include <bsd.port.mk>