diff --git a/net/signond-qt6/Makefile b/net/signond-qt6/Makefile
new file mode 100644
index 00000000000..1b3d1cc522b
--- /dev/null
+++ b/net/signond-qt6/Makefile
@@ -0,0 +1,30 @@
+COMMENT =	SignOn Daemon (Qt)
+
+CATEGORIES =	net
+
+HOMEPAGE =	https://accounts-sso.gitlab.io/
+
+V =		VERSION_8.61
+DIST_TUPLE =	gitlab nicolasfella signond \
+		c8ad98249af541514ff7a81634d3295e712f1a39 .
+DISTNAME =	signond-qt6-${V:S/VERSION_//}
+
+MAINTAINER =	Rafael Sadowski <rsadowski@openbsd.org>
+
+SHARED_LIBS +=  signon-qt6                0.0 # 1.0
+
+# LGPLv2.1+, GPLv2+
+PERMIT_PACKAGE =	Yes
+
+WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6DBus m
+
+MODULES =	x11/qt6 \
+		devel/qmake
+
+WRKDIST =	${WRKDIR}/signond-c8ad98249af541514ff7a81634d3295e712f1a39
+
+pre-configure:
+	ln -sf ${LOCALBASE}/lib/qt6/bin/q{collection,help}generator ${WRKDIR}/bin/
+	${SUBST_CMD} ${WRKSRC}/lib/SignOn/SignOnQt6Config.cmake.in
+
+.include <bsd.port.mk>
diff --git a/net/signond-qt6/distinfo b/net/signond-qt6/distinfo
new file mode 100644
index 00000000000..3f2cbdf72a8
--- /dev/null
+++ b/net/signond-qt6/distinfo
@@ -0,0 +1,2 @@
+SHA256 (nicolasfella-signond-c8ad98249af541514ff7a81634d3295e712f1a39.tar.gz) = LD3Zf825Dzi7mIT34R0PubohT3i92qyyfklpzv/31pA=
+SIZE (nicolasfella-signond-c8ad98249af541514ff7a81634d3295e712f1a39.tar.gz) = 283647
diff --git a/net/signond-qt6/patches/patch-lib_SignOn_SignOnQt6Config_cmake_in b/net/signond-qt6/patches/patch-lib_SignOn_SignOnQt6Config_cmake_in
new file mode 100644
index 00000000000..d326f71d2bd
--- /dev/null
+++ b/net/signond-qt6/patches/patch-lib_SignOn_SignOnQt6Config_cmake_in
@@ -0,0 +1,11 @@
+Index: lib/SignOn/SignOnQt6Config.cmake.in
+--- lib/SignOn/SignOnQt6Config.cmake.in.orig
++++ lib/SignOn/SignOnQt6Config.cmake.in
+@@ -2,6 +2,6 @@
+ #  SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt
+ #  SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt
+ 
+-set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
++set(SIGNONQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so.${LIBsignon-qt6_VERSION})
+ set(SIGNONQT_LIBRARIES_STATIC $${INSTALL_LIBDIR}/lib$${TARGET}.a)
+ set(SIGNONQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET})
diff --git a/net/signond-qt6/patches/patch-lib_SignOn_SignOn_pro b/net/signond-qt6/patches/patch-lib_SignOn_SignOn_pro
new file mode 100644
index 00000000000..d7f3518aac1
--- /dev/null
+++ b/net/signond-qt6/patches/patch-lib_SignOn_SignOn_pro
@@ -0,0 +1,8 @@
+Index: lib/SignOn/SignOn.pro
+--- lib/SignOn/SignOn.pro.orig
++++ lib/SignOn/SignOn.pro
+@@ -4,4 +4,3 @@ SUBDIRS = \
+     libsignon-qt-shared.pro \
+     libsignon-qt-static.pro
+ 
+-include(doc/doc.pri)
diff --git a/net/signond-qt6/patches/patch-lib_lib_pro b/net/signond-qt6/patches/patch-lib_lib_pro
new file mode 100644
index 00000000000..8e4e0a85ce9
--- /dev/null
+++ b/net/signond-qt6/patches/patch-lib_lib_pro
@@ -0,0 +1,8 @@
+Index: lib/lib.pro
+--- lib/lib.pro.orig
++++ lib/lib.pro
+@@ -1,3 +1,3 @@
+ TEMPLATE = subdirs
+-SUBDIRS = signond SignOn plugins
++SUBDIRS = SignOn
+ 
diff --git a/net/signond-qt6/patches/patch-signon_pro b/net/signond-qt6/patches/patch-signon_pro
new file mode 100644
index 00000000000..c578f14a8b0
--- /dev/null
+++ b/net/signond-qt6/patches/patch-signon_pro
@@ -0,0 +1,17 @@
+Index: signon.pro
+--- signon.pro.orig
++++ signon.pro
+@@ -1,12 +1,8 @@
+ include( common-vars.pri )
+ 
+ TEMPLATE  = subdirs
+-SUBDIRS   = lib src server tests
+-src.depends = lib
+-tests.depends = lib src
++SUBDIRS   = lib
+ 
+ include( common-installs-config.pri )
+-
+-include( doc/doc.pri )
+ 
+ # End of File
diff --git a/net/signond-qt6/patches/patch-src_signond_signond_pro b/net/signond-qt6/patches/patch-src_signond_signond_pro
new file mode 100644
index 00000000000..c01aacf74ce
--- /dev/null
+++ b/net/signond-qt6/patches/patch-src_signond_signond_pro
@@ -0,0 +1,20 @@
+Index: src/signond/signond.pro
+--- src/signond/signond.pro.orig
++++ src/signond/signond.pro
+@@ -95,7 +95,6 @@ DEFINES += "SIGNOND_EXTENSIONS_DIR=$${SIGNOND_EXTENSIO
+ #Trace defines can be overruled by signond's configuration file `LoggingLevel`
+ DEFINES += SIGNOND_TRACE
+ LIBS += \
+-    -lrt \
+     -lsignon-plugins-common \
+     -lsignon-extension
+ 
+@@ -108,7 +107,7 @@ include( ../../common-installs-config.pri )
+         setupstorage.sh
+ 
+     conf_file.files = $$OTHER_FILES
+-    conf_file.path = /etc/
++    conf_file.path = $${INSTALL_PREFIX}/share/examples/signond/
+ 
+     INSTALLS += conf_file
+ }
diff --git a/net/signond-qt6/pkg/DESCR b/net/signond-qt6/pkg/DESCR
new file mode 100644
index 00000000000..2f95640ccd9
--- /dev/null
+++ b/net/signond-qt6/pkg/DESCR
@@ -0,0 +1,3 @@
+The SignOn daemon is a D-Bus service which performs user authentication on
+behalf of its clients. There are currently authentication plugins for OAuth 1.0
+and 2.0, SASL, Digest-MD5, and plain username/password combination.
diff --git a/net/signond-qt6/pkg/PLIST b/net/signond-qt6/pkg/PLIST
new file mode 100644
index 00000000000..be891aeb394
--- /dev/null
+++ b/net/signond-qt6/pkg/PLIST
@@ -0,0 +1,24 @@
+include/signon-qt6/
+include/signon-qt6/SignOn/
+include/signon-qt6/SignOn/AuthService
+include/signon-qt6/SignOn/AuthSession
+include/signon-qt6/SignOn/Error
+include/signon-qt6/SignOn/Identity
+include/signon-qt6/SignOn/IdentityInfo
+include/signon-qt6/SignOn/SecurityContext
+include/signon-qt6/SignOn/SessionData
+include/signon-qt6/SignOn/authservice.h
+include/signon-qt6/SignOn/authsession.h
+include/signon-qt6/SignOn/identity.h
+include/signon-qt6/SignOn/identityinfo.h
+include/signon-qt6/SignOn/libsignoncommon.h
+include/signon-qt6/SignOn/securitycontext.h
+include/signon-qt6/SignOn/sessiondata.h
+include/signon-qt6/SignOn/signon.h
+include/signon-qt6/SignOn/signonerror.h
+lib/cmake/SignOnQt6/
+lib/cmake/SignOnQt6/SignOnQt6Config.cmake
+lib/cmake/SignOnQt6/SignOnQt6ConfigVersion.cmake
+@static-lib lib/libsignon-qt6.a
+@lib lib/libsignon-qt6.so.${LIBsignon-qt6_VERSION}
+lib/pkgconfig/libsignon-qt6.pc