diff --git a/net-im/qxmpp-qt5/Makefile b/net-im/qxmpp-qt5/Makefile
index 704a31ea5536..77eb2b4a9aab 100644
--- a/net-im/qxmpp-qt5/Makefile
+++ b/net-im/qxmpp-qt5/Makefile
@@ -1,23 +1,27 @@
 PORTNAME=	qxmpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	net-im
 PKGNAMESUFFIX=	-qt5
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	XMPP client library based on Qt and C++
 WWW=		https://github.com/qxmpp-project/qxmpp/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt
 
-USES=		cmake compiler:c++17-lang libtool pathfix pkgconfig qt:5
+LIB_DEPENDS=	libomemo-c.so:security/libomemo-c
+
+USES=		cmake compiler:c++17-lang libtool pathfix pkgconfig qca qt:5
 USE_QT=		core gui network xml \
 		buildtools:build qmake:build testlib:build
+CMAKE_ON=	BUILD_OMEMO
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	qxmpp-project
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/net-im/qxmpp-qt5/pkg-plist b/net-im/qxmpp-qt5/pkg-plist
index c5d6650931ce..c7fff8b93a5f 100644
--- a/net-im/qxmpp-qt5/pkg-plist
+++ b/net-im/qxmpp-qt5/pkg-plist
@@ -1,136 +1,148 @@
 include/qxmpp/QXmppArchiveIq.h
 include/qxmpp/QXmppArchiveManager.h
 include/qxmpp/QXmppAtmManager.h
 include/qxmpp/QXmppAtmTrustMemoryStorage.h
 include/qxmpp/QXmppAtmTrustStorage.h
 include/qxmpp/QXmppAttentionManager.h
 include/qxmpp/QXmppBindIq.h
 include/qxmpp/QXmppBitsOfBinaryContentId.h
 include/qxmpp/QXmppBitsOfBinaryData.h
 include/qxmpp/QXmppBitsOfBinaryDataList.h
 include/qxmpp/QXmppBitsOfBinaryIq.h
 include/qxmpp/QXmppBookmarkManager.h
 include/qxmpp/QXmppBookmarkSet.h
 include/qxmpp/QXmppByteStreamIq.h
 include/qxmpp/QXmppCarbonManager.h
 include/qxmpp/QXmppCarbonManagerV2.h
 include/qxmpp/QXmppClient.h
 include/qxmpp/QXmppClientExtension.h
 include/qxmpp/QXmppConfiguration.h
 include/qxmpp/QXmppDataForm.h
 include/qxmpp/QXmppDataFormBase.h
 include/qxmpp/QXmppDialback.h
 include/qxmpp/QXmppDiscoveryIq.h
 include/qxmpp/QXmppDiscoveryManager.h
 include/qxmpp/QXmppE2eeExtension.h
 include/qxmpp/QXmppE2eeMetadata.h
 include/qxmpp/QXmppElement.h
+include/qxmpp/QXmppEncryptedFileSharingProvider.h
 include/qxmpp/QXmppEncryptedFileSource.h
 include/qxmpp/QXmppEntityTimeIq.h
 include/qxmpp/QXmppEntityTimeManager.h
 include/qxmpp/QXmppError.h
 include/qxmpp/QXmppExtension.h
 include/qxmpp/QXmppFileMetadata.h
 include/qxmpp/QXmppFileShare.h
 include/qxmpp/QXmppFileSharingManager.h
 include/qxmpp/QXmppFileSharingProvider.h
 include/qxmpp/QXmppFutureUtils_p.h
 include/qxmpp/QXmppGeolocItem.h
 include/qxmpp/QXmppGlobal.h
 include/qxmpp/QXmppHash.h
 include/qxmpp/QXmppHttpFileSharingProvider.h
 include/qxmpp/QXmppHttpFileSource.h
 include/qxmpp/QXmppHttpUploadIq.h
 include/qxmpp/QXmppHttpUploadManager.h
 include/qxmpp/QXmppIbbIq.h
 include/qxmpp/QXmppIncomingClient.h
 include/qxmpp/QXmppIncomingServer.h
 include/qxmpp/QXmppInvokable.h
 include/qxmpp/QXmppIq.h
 include/qxmpp/QXmppIqHandling.h
 include/qxmpp/QXmppJingleIq.h
 include/qxmpp/QXmppLogger.h
 include/qxmpp/QXmppMamIq.h
 include/qxmpp/QXmppMamManager.h
 include/qxmpp/QXmppMessage.h
 include/qxmpp/QXmppMessageHandler.h
 include/qxmpp/QXmppMessageReaction.h
 include/qxmpp/QXmppMessageReceiptManager.h
 include/qxmpp/QXmppMixInfoItem.h
 include/qxmpp/QXmppMixInvitation.h
 include/qxmpp/QXmppMixIq.h
 include/qxmpp/QXmppMixParticipantItem.h
 include/qxmpp/QXmppMucIq.h
 include/qxmpp/QXmppMucManager.h
 include/qxmpp/QXmppNonSASLAuth.h
 include/qxmpp/QXmppNonza.h
 include/qxmpp/QXmppOutOfBandUrl.h
 include/qxmpp/QXmppOutgoingClient.h
 include/qxmpp/QXmppOutgoingServer.h
 include/qxmpp/QXmppPasswordChecker.h
 include/qxmpp/QXmppPingIq.h
 include/qxmpp/QXmppPresence.h
 include/qxmpp/QXmppPromise.h
 include/qxmpp/QXmppPubSubAffiliation.h
 include/qxmpp/QXmppPubSubEvent.h
 include/qxmpp/QXmppPubSubEventHandler.h
 include/qxmpp/QXmppPubSubIq_p.h
 include/qxmpp/QXmppPubSubItem.h
 include/qxmpp/QXmppPubSubManager.h
 include/qxmpp/QXmppPubSubMetadata.h
 include/qxmpp/QXmppPubSubNodeConfig.h
 include/qxmpp/QXmppPubSubPublishOptions.h
 include/qxmpp/QXmppPubSubSubAuthorization.h
 include/qxmpp/QXmppPubSubSubscribeOptions.cpp
 include/qxmpp/QXmppPubSubSubscription.h
 include/qxmpp/QXmppPushEnableIq.h
 include/qxmpp/QXmppRegisterIq.h
 include/qxmpp/QXmppRegistrationManager.h
 include/qxmpp/QXmppRemoteMethod.h
 include/qxmpp/QXmppResultSet.h
 include/qxmpp/QXmppRosterIq.h
 include/qxmpp/QXmppRosterManager.h
 include/qxmpp/QXmppRpcIq.h
 include/qxmpp/QXmppRpcManager.h
 include/qxmpp/QXmppSendResult.h
 include/qxmpp/QXmppSendStanzaParams.h
 include/qxmpp/QXmppServer.h
 include/qxmpp/QXmppServerExtension.h
 include/qxmpp/QXmppServerPlugin.h
 include/qxmpp/QXmppSessionIq.h
 include/qxmpp/QXmppSocks.h
 include/qxmpp/QXmppStanza.h
 include/qxmpp/QXmppStartTlsPacket.h
 include/qxmpp/QXmppStream.h
 include/qxmpp/QXmppStreamFeatures.h
 include/qxmpp/QXmppStun.h
 include/qxmpp/QXmppTask.h
 include/qxmpp/QXmppThumbnail.h
 include/qxmpp/QXmppTransferManager.h
 include/qxmpp/QXmppTransferManager_p.h
 include/qxmpp/QXmppTrustLevel.h
 include/qxmpp/QXmppTrustManager.h
 include/qxmpp/QXmppTrustMemoryStorage.h
 include/qxmpp/QXmppTrustMessageElement.h
 include/qxmpp/QXmppTrustMessageKeyOwner.h
 include/qxmpp/QXmppTrustMessages.h
 include/qxmpp/QXmppTrustSecurityPolicy.h
 include/qxmpp/QXmppTrustStorage.h
 include/qxmpp/QXmppUploadRequestManager.h
 include/qxmpp/QXmppUserLocationManager.h
 include/qxmpp/QXmppUserTuneItem.h
 include/qxmpp/QXmppUserTuneManager.h
 include/qxmpp/QXmppUtils.h
 include/qxmpp/QXmppVCardIq.h
 include/qxmpp/QXmppVCardManager.h
 include/qxmpp/QXmppVersionIq.h
 include/qxmpp/QXmppVersionManager.h
+include/qxmpp/omemo/QXmppOmemoManager.h
+include/qxmpp/omemo/QXmppOmemoMemoryStorage.h
+include/qxmpp/omemo/QXmppOmemoStorage.h
+include/qxmpp/omemo/qxmppomemo_export.h
 include/qxmpp/qxmpp_export.h
+lib/cmake/QXmppOmemo/QXmppOmemo-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/QXmppOmemo/QXmppOmemo.cmake
+lib/cmake/QXmppOmemo/QXmppOmemoConfig.cmake
+lib/cmake/QXmppOmemo/QXmppOmemoConfigVersion.cmake
 lib/cmake/qxmpp/QXmpp-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/qxmpp/QXmpp.cmake
 lib/cmake/qxmpp/QXmppConfig.cmake
 lib/cmake/qxmpp/QXmppConfigVersion.cmake
+lib/libQXmppOmemo.so
+lib/libQXmppOmemo.so.%%VERSION%%
+lib/libQXmppOmemo.so.4
 lib/libqxmpp.so
 lib/libqxmpp.so.%%VERSION%%
 lib/libqxmpp.so.4
 libdata/pkgconfig/qxmpp.pc