diff --git a/deskutils/qownnotes/Makefile b/deskutils/qownnotes/Makefile
index d44e4dfb8e08..c304b0a5507e 100644
--- a/deskutils/qownnotes/Makefile
+++ b/deskutils/qownnotes/Makefile
@@ -1,27 +1,38 @@
 PORTNAME=	qownnotes
-PORTVERSION=	25.5.10
+PORTVERSION=	25.6.1
 CATEGORIES=	deskutils
 MASTER_SITES=	https://github.com/pbek/QOwnNotes/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	stobbsm@gmail.com
 COMMENT=	Markdown note taking program with cloud integration
 WWW=		https://www.qownnotes.org/
 
 LICENSE=	GPLv2
 
-DEPRECATED=	Depends on expired security/botan2
-EXPIRATION_DATE=2025-06-21
-
-LIB_DEPENDS=	libbotan-2.so:security/botan2
 RUN_DEPENDS=	git:devel/git
 
-USES=		gl gmake pkgconfig qmake qt:5 tar:xz xorg
+USES=		gl pkgconfig tar:xz xorg
 USE_GL=		gl
+USE_XORG=	x11
+
+FLAVORS=	qt5 qt6
+
+.if ${FLAVOR:U} == qt6
+LIB_DEPENDS=	libbotan-3.so:security/botan3
+CMAKE_ON=	BUILD_WITH_SYSTEM_BOTAN QON_QT6_BUILD
+USES+=		cmake qt:6
+USE_QT=		tools:build base declarative svg websockets
+USE_XORG+=	ice sm xext
+PKGNAMESUFFIX=	-${FLAVOR}
+
+post-patch:
+	@${REINPLACE_CMD} -e '/QON_QM_FILES/s,QOwnNotes,${_QT_RELNAME},' \
+		${WRKSRC}/CMakeLists.txt
+.else
+USES+=		gmake qmake qt:5
 USE_QT=		buildtools:build linguisttools:build sql-sqlite3:run \
 		concurrent core declarative gui network printsupport \
 		sql svg websockets widgets x11extras xml
-USE_XORG=	x11
-
-QMAKE_ARGS=	USE_SYSTEM_BOTAN=1
+.endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/qownnotes/distinfo b/deskutils/qownnotes/distinfo
index ce9b06ce946f..407c97cabae8 100644
--- a/deskutils/qownnotes/distinfo
+++ b/deskutils/qownnotes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747770153
-SHA256 (qownnotes-25.5.10.tar.xz) = 3fcbc12c39e40634d4ff1e3b91ad0fb379d1f968b80ba1b1f9dd2c3fc945ff13
-SIZE (qownnotes-25.5.10.tar.xz) = 5594656
+TIMESTAMP = 1749473409
+SHA256 (qownnotes-25.6.1.tar.xz) = cb4936159fe95d95d411bd2618d3230b95fa54fac33704047c04cfd4b42b4e8f
+SIZE (qownnotes-25.6.1.tar.xz) = 5611852
diff --git a/deskutils/qownnotes/files/patch-libraries_botan_botan.cpp b/deskutils/qownnotes/files/patch-libraries_botan_botan.cpp
new file mode 100644
index 000000000000..696ced30c8de
--- /dev/null
+++ b/deskutils/qownnotes/files/patch-libraries_botan_botan.cpp
@@ -0,0 +1,21 @@
+--- libraries/botan/botan.cpp.orig	2025-06-01 19:29:53 UTC
++++ libraries/botan/botan.cpp
+@@ -6138,7 +6138,7 @@ uint64_t CPUID::CPUID_Data::detect_cpu_features(size_t
+ 
+     if (error == 0 && vector_type > 0) return CPUID::CPUID_ALTIVEC_BIT;
+ 
+-#elif (defined(BOTAN_TARGET_OS_HAS_GETAUXVAL) || defined(BOTAN_TARGET_HAS_ELF_AUX_INFO)) && \
++#elif (defined(BOTAN_TARGET_OS_HAS_GETAUXVAL) || defined(BOTAN_TARGET_OS_HAS_ELF_AUX_INFO)) && \
+     defined(BOTAN_TARGET_ARCH_IS_PPC64)
+ 
+     enum PPC_hwcap_bit {
+@@ -6223,8 +6223,7 @@ uint64_t CPUID::CPUID_Data::detect_cpu_features(size_t
+ #include <intrin.h>
+ #elif defined(BOTAN_BUILD_COMPILER_IS_INTEL)
+ #include <ia32intrin.h>
+-#elif defined(BOTAN_BUILD_COMPILER_IS_GCC) && (BOTAN_GCC_VERSION >= 430)
+-     // Only available starting in GCC 4.3
++#elif defined(BOTAN_BUILD_COMPILER_IS_GCC) || defined(BOTAN_BUILD_COMPILER_IS_CLANG)
+ #include <cpuid.h>
+ 
+ namespace {
diff --git a/deskutils/qownnotes/files/patch-libraries_botan_botan.pri b/deskutils/qownnotes/files/patch-libraries_botan_botan.pri
new file mode 100644
index 000000000000..c9441e2f1978
--- /dev/null
+++ b/deskutils/qownnotes/files/patch-libraries_botan_botan.pri
@@ -0,0 +1,15 @@
+--- libraries/botan/botan.pri.orig	2025-06-01 19:29:53 UTC
++++ libraries/botan/botan.pri
+@@ -59,8 +59,11 @@ unix:*-g++* {
+     QMAKE_CXXFLAGS -= -Werror
+ }
+ 
+-linux*|freebsd* {
++linux {
+     LIBS += -lrt $$QMAKE_LIBS_DYNLOAD
+     DEFINES += BOTAN_TARGET_OS_HAS_GETAUXVAL
+ }
++
++freebsd:DEFINES += BOTAN_TARGET_OS_HAS_CLOCK_GETTIME \
++    BOTAN_TARGET_OS_HAS_ELF_AUX_INFO BOTAN_TARGET_OS_HAS_POSIX1
+ }