diff --git a/sysutils/signon-plugin-oauth2/Makefile b/sysutils/signon-plugin-oauth2/Makefile
index 99f1d89537e3..9f5ed241e90e 100644
--- a/sysutils/signon-plugin-oauth2/Makefile
+++ b/sysutils/signon-plugin-oauth2/Makefile
@@ -1,33 +1,39 @@
 PORTNAME=	signon-plugin-oauth2
 DISTVERSION=	0.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils kde
 DISTNAME=	archive
 DIST_SUBDIR=	KDE/${GL_ACCOUNT}
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Signon OAuth 1.0 and 2.0 plugin for accounts-sso
 WWW=		https://gitlab.com/accounts-sso/signon-plugin-oauth2
 
-LIB_DEPENDS=	libsignon-qt5.so:sysutils/signond@qt5
+FLAVORS=	qt5 qt6
+FLAVOR?=	qt5
 
-USES=		compiler:c++11-lang pkgconfig python qmake qt:5
-USE_QT=		core network testlib \
+LIB_DEPENDS=	libsignon-qt${FLAVOR:S/qt//}.so:sysutils/signond@${FLAVOR}
+
+USES=		compiler:c++11-lang pkgconfig python qmake qt:${FLAVOR:S/qt//}
+_USE_QT_qt5=	core network testlib \
 		buildtools:build qmake:build
+_USE_QT_qt6=	base
+USE_QT=		${_USE_QT_${FLAVOR}}
 USE_LDCONFIG=	${PREFIX}/lib/signon
 
 QMAKE_ENV=	PREFIX=${PREFIX}
 
 # gitlab variables
 USE_GITLAB=	yes
-GL_ACCOUNT=	accounts-sso
-GL_TAGNAME=	091887d09bb635fa31f69ed16d384563cddc8009
+GL_ACCOUNT=	nicolasfella
+GL_TAGNAME=	fab698862466994a8fdc9aa335c87b4f05430ce6
 
 # Fix for  Qt5-5.13:
 # oauth2plugin.cpp:133:9: error: 'addQueryItem' is deprecated [-Werror,-Wdeprecated-declarations]
 #  url.addQueryItem(CLIENT_ID, d->m_oauth2Data.ClientId());
 #      ^
 post-patch:
 	${REINPLACE_CMD} '/-Werror/d' ${PATCH_WRKSRC}/common-project-config.pri
 
 .include <bsd.port.mk>
diff --git a/sysutils/signon-plugin-oauth2/distinfo b/sysutils/signon-plugin-oauth2/distinfo
index 143ada737dc0..4128647a65cb 100644
--- a/sysutils/signon-plugin-oauth2/distinfo
+++ b/sysutils/signon-plugin-oauth2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626330369
-SHA256 (KDE/accounts-sso/accounts-sso-signon-plugin-oauth2-091887d09bb635fa31f69ed16d384563cddc8009_GL0.tar.gz) = 4ac679bead32d2cbafc902b66cc84e5ada38e977ad583a1bc55c106f18c2e04c
-SIZE (KDE/accounts-sso/accounts-sso-signon-plugin-oauth2-091887d09bb635fa31f69ed16d384563cddc8009_GL0.tar.gz) = 41112
+TIMESTAMP = 1704457883
+SHA256 (KDE/nicolasfella/nicolasfella-signon-plugin-oauth2-fab698862466994a8fdc9aa335c87b4f05430ce6_GL0.tar.gz) = 5a1298cc49f504503f54f20f0f5f685e43f541244a654dd3da58951f43782625
+SIZE (KDE/nicolasfella/nicolasfella-signon-plugin-oauth2-fab698862466994a8fdc9aa335c87b4f05430ce6_GL0.tar.gz) = 41352
diff --git a/x11/plasma6-plasma-desktop/Makefile b/x11/plasma6-plasma-desktop/Makefile
index f3d8e5f60c3d..b8561ce724c9 100644
--- a/x11/plasma6-plasma-desktop/Makefile
+++ b/x11/plasma6-plasma-desktop/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	plasma-desktop
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-plasma
 
 COMMENT=	KDE Plasma Desktop
 MAINTAINER=	kde@FreeBSD.org
 
 BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols \
 		xf86-input-evdev>0:x11-drivers/xf86-input-evdev \
 		xf86-input-libinput>0:x11-drivers/xf86-input-libinput \
 		xf86-input-synaptics>0:x11-drivers/xf86-input-synaptics
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libicuuc.so:devel/icu \
-		liboauth2plugin.so:sysutils/signon-plugin-oauth2 \
+		liboauth2plugin.so:sysutils/signon-plugin-oauth2@qt6 \
 		libwayland-client.so:graphics/wayland \
 		libxcb-util.so:x11/xcb-util \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxkbfile.so:x11/libxkbfile
 RUN_DEPENDS=	noto-emoji>0:x11-fonts/noto-emoji \
 		xdg-user-dir:devel/xdg-user-dirs \
 		xf86-input-evdev>0:x11-drivers/xf86-input-evdev \
 		xf86-input-libinput>0:x11-drivers/xf86-input-libinput \
 		xf86-input-synaptics>0:x11-drivers/xf86-input-synaptics
 
 USES=		cmake gettext gl kde:6 pkgconfig python qt:6 tar:xz xorg
 USE_GL=		gl opengl
 USE_KDE=	activities activities-stats attica5 auth baloo5 bookmarks \
 		codecs colorscheme completion config configwidgets coreaddons \
 		crash dbusaddons doctools filemetadata globalaccel guiaddons \
 		i18n iconthemes itemmodels itemviews jobwidgets kcmutils kio \
 		libksysguard libplasma newstuff notifications notifyconfig \
 		package plasma-workspace plasma5support runner service solid \
 		sonnet svg widgetsaddons windowsystem xmlgui \
 		ecm:build \
 		kirigami-addons:run kirigami2:run kpipewire:run \
 		qqc2-desktop-style:run
 USE_QT=		5compat base declarative svg
 USE_XORG=	x11 xcb xcursor xext xfixes xi xrender
 
 #SHEBANG_FILES=	kcms/keyboard/*.py kcms/ksmserver/kconf_update/*.py
 
 .include <bsd.port.mk>