diff --git a/graphics/knotter/Makefile b/graphics/knotter/Makefile
index 6d286649c629..78ee97c5abda 100644
--- a/graphics/knotter/Makefile
+++ b/graphics/knotter/Makefile
@@ -1,29 +1,36 @@
 PORTNAME=	knotter
-DISTVERSION=	0.9.6-20220205
+DISTVERSION=	0.9.6-20230206
 CATEGORIES=	graphics
+MASTER_SITES=	LOCAL/yuri:patches # Qt6 patch, upstreamed https://gitlab.com/mattbas/Knotter/-/work_items/164
+DISTFILES=	${PORTNAME}-${DISTVERSION}-qt6.tgz:patches # Qt6 patch, upstreamed https://gitlab.com/mattbas/Knotter/-/work_items/164
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Interactive designer for Celtic knots
-WWW=		https://knotter.mattbas.org/Knotter
+WWW=		https://gitlab.com/mattbas/Knotter
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cmake compiler:c++11-lang desktop-file-utils gl qt:5
-USE_QT=		core gui network printsupport script svg xml widgets \
-		buildtools:build linguisttools:build qmake:build uitools:build
-USE_GL=		gl
+USES=		cmake compiler:c++17-lang desktop-file-utils gl qt:6
+USE_QT=		base declarative svg tools:build
+USE_GL=		opengl
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	mattbas
 GL_PROJECT=	Knotter
-GL_TAGNAME=	9ce77e3e0507343a3b400c6806ab79b52b1ad596
+GL_TAGNAME=	fb8f1457c42d40df523860bb1cda55eca609f3b9
 
 GL_TUPLE=	mattbas:CMake-Lib:6dd5afe4059899b47dbe0a7e2b940b1af41a59f6:mattbas_CMake_Lib/cmake \
 		mattbas:Qt-Color-Widgets:450e54570a6f96b2d90960c3c62f7111bbc147e9:mattbas_Qt_Color_Widgets/src/widgets/color \
 		mattbas:Qt-Extended-TabWidget:77cffc0714f9690d5627eaf6bd9b86b560f24066:mattbas_Qt_Extended_TabWidget/src/widgets/tabwidget \
 		mattbas:Qt-History-LineEdit:fd37e87bb790d87c709a3234b8a0d8eedbb04031:mattbas_Qt_History_LineEdit/src/widgets/history_line_edit \
 		mattbas:Qt-KeySequence-Widget:55faa8665c24bdc709582adb404401a909fc8c0c:mattbas_Qt_KeySequence_Widget/src/widgets/keysequence_widget \
 		mattbas:Qt-Toolbar-Editor:dff8fa080f5fa596517c4d4c9523c7a968f13766:mattbas_Qt_Toolbar_Editor/src/widgets/toolbar_editor
 
+CMAKE_ARGS=	-DCMAKE_POLICY_VERSION_MINIMUM=3.5 # CMake 4.5 compatibility, see https://gitlab.com/mattbas/Knotter/-/work_items/163
+
+post-patch: # patch for Qt6 using the downloaded patch
+	@cd ${WRKSRC} && \
+		${PATCH} < ${WRKDIR}/patches/knotter-${DISTVERSION}-qt6.patch
+
 .include <bsd.port.mk>
diff --git a/graphics/knotter/distinfo b/graphics/knotter/distinfo
index 345ac40ecaad..937544901532 100644
--- a/graphics/knotter/distinfo
+++ b/graphics/knotter/distinfo
@@ -1,15 +1,17 @@
-TIMESTAMP = 1644081035
-SHA256 (mattbas-Knotter-9ce77e3e0507343a3b400c6806ab79b52b1ad596_GL0.tar.gz) = a4a19b3ac19eba20298a52b6055e2d4dc619e247d8b46c4aaaae30e9b6fbf76a
-SIZE (mattbas-Knotter-9ce77e3e0507343a3b400c6806ab79b52b1ad596_GL0.tar.gz) = 4814498
+TIMESTAMP = 1790723874
+SHA256 (knotter-0.9.6-20230206-qt6.tgz) = c486af6ffbdb9f3845856c2c4c304495e6559d3a45da9e393219b7d1058e6372
+SIZE (knotter-0.9.6-20230206-qt6.tgz) = 19100
+SHA256 (mattbas-Knotter-fb8f1457c42d40df523860bb1cda55eca609f3b9_GL0.tar.gz) = 6ebc147f917bd1ec6730943a199facd6c8f15d11aabf1e0cf683dbbcefb35057
+SIZE (mattbas-Knotter-fb8f1457c42d40df523860bb1cda55eca609f3b9_GL0.tar.gz) = 4815864
 SHA256 (mattbas-CMake-Lib-6dd5afe4059899b47dbe0a7e2b940b1af41a59f6_GL0.tar.gz) = 3dee5bad6a403266e17eb0d179784f2bdfdcdfaadbd771a2b943ac3ef64f489a
 SIZE (mattbas-CMake-Lib-6dd5afe4059899b47dbe0a7e2b940b1af41a59f6_GL0.tar.gz) = 9179
 SHA256 (mattbas-Qt-Color-Widgets-450e54570a6f96b2d90960c3c62f7111bbc147e9_GL0.tar.gz) = 8bdc45d6fa45345cf573e2dc9f88b5e10b8a774be5b99eae987e0868afe6d294
 SIZE (mattbas-Qt-Color-Widgets-450e54570a6f96b2d90960c3c62f7111bbc147e9_GL0.tar.gz) = 206928
 SHA256 (mattbas-Qt-Extended-TabWidget-77cffc0714f9690d5627eaf6bd9b86b560f24066_GL0.tar.gz) = 7efb048130ee63a6686277dec1c634627d7756e88cbf453fa255a2e639eec107
 SIZE (mattbas-Qt-Extended-TabWidget-77cffc0714f9690d5627eaf6bd9b86b560f24066_GL0.tar.gz) = 6891
 SHA256 (mattbas-Qt-History-LineEdit-fd37e87bb790d87c709a3234b8a0d8eedbb04031_GL0.tar.gz) = 29a39539865d32eea00c25deb78f564175ef8a71561570f0e431dad1f3068bab
 SIZE (mattbas-Qt-History-LineEdit-fd37e87bb790d87c709a3234b8a0d8eedbb04031_GL0.tar.gz) = 7836
 SHA256 (mattbas-Qt-KeySequence-Widget-55faa8665c24bdc709582adb404401a909fc8c0c_GL0.tar.gz) = c8bf2952a02ef71941c14f8a089b4db9ed48e9777c043d9ced08bf7f08e1d67c
 SIZE (mattbas-Qt-KeySequence-Widget-55faa8665c24bdc709582adb404401a909fc8c0c_GL0.tar.gz) = 10054
 SHA256 (mattbas-Qt-Toolbar-Editor-dff8fa080f5fa596517c4d4c9523c7a968f13766_GL0.tar.gz) = 98859ef97c2be18ce383687832989ff7120320ada46f5f3aaf70c05d1f761403
 SIZE (mattbas-Qt-Toolbar-Editor-dff8fa080f5fa596517c4d4c9523c7a968f13766_GL0.tar.gz) = 9633