diff --git a/net-im/kaccounts-integration/Makefile b/net-im/kaccounts-integration/Makefile
index 3a1a65869cae..f3b99dec617a 100644
--- a/net-im/kaccounts-integration/Makefile
+++ b/net-im/kaccounts-integration/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	kaccounts-integration
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	System to administer web accounts for the KDE desktop
 WWW=		https://projects.kde.org/projects/kdereview/kaccounts-integration
 
 LIB_DEPENDS=	libQCoro5Core.so:devel/qcoro@qt5 \
 		libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \
 		libsignon-qt5.so:sysutils/signond@qt5
-RUN_DEPENDS=	signon-ui:sysutils/signon-ui
+RUN_DEPENDS=	signon-ui:sysutils/signon-ui@qt5
 
 USES=		cmake compiler:c++11-lang gettext-tools pkgconfig kde:5 \
 		qt:5 tar:xz
 USE_KDE=	config coreaddons dbusaddons i18n kcmutils kdeclarative kio \
 		service wallet \
 		ecm:build package:build \
 		iconthemes:run
 USE_QT=		concurrent core dbus declarative gui network widgets xml \
 		buildtools:build qmake:build
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc*} && ${OSVERSION} < 1400092
 USES+=		llvm:min=16
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/signon-ui/Makefile b/sysutils/signon-ui/Makefile
index 77140d2dc5a1..8f697ddbc76f 100644
--- a/sysutils/signon-ui/Makefile
+++ b/sysutils/signon-ui/Makefile
@@ -1,33 +1,37 @@
 PORTNAME=	signon-ui
 # Note, we're counting since the 0.17+15.10.20150810-0ubuntu1 tag:
 # > git rev-list 0.17+15.10.20150810-0ubuntu1.. --count
 DISTVERSION=	0.17-355
 DISTVERSIONSUFFIX=	-g4368bb7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils kde
 DIST_SUBDIR=	KDE/${GL_ACCOUNT}
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Component for handling accounts-sso user interactions
 WWW=		https://gitlab.com/accounts-sso/signon-ui
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \
+FLAVORS=	qt5 qt6
+FLAVOR?=	qt5
+
+LIB_DEPENDS=	libaccounts-${FLAVOR}.so:net-im/libaccounts-qt@${FLAVOR} \
 		libnotify.so:devel/libnotify \
-		libsignon-qt5.so:sysutils/signond@qt5 \
+		libsignon-${FLAVOR}.so:sysutils/signond@${FLAVOR} \
 		libproxy.so:net/libproxy
 
 USES=		compiler:c++11-lang gettext-runtime gl gnome pkgconfig python \
-		qmake qt:5 tar:bz2
+		qmake qt:${FLAVOR:S/qt//} tar:bz2
 USE_GL=		gl
 USE_GNOME=	gdkpixbuf2 glib20
 USE_QT=		core dbus declarative gui location network webchannel webengine widgets xml \
 		buildtools:build qmake:build
 # gitlab variables
 USE_GITLAB=	yes
 GL_ACCOUNT=	accounts-sso
 GL_TAGNAME=	4368bb77d9d1abc2978af514225ba4a42c29a646
 
 .include <bsd.port.mk>