diff --git a/www/dooble/Makefile b/www/dooble/Makefile
index f46b2274ca23..d2590983ab21 100644
--- a/www/dooble/Makefile
+++ b/www/dooble/Makefile
@@ -1,44 +1,56 @@
 PORTNAME=	dooble
-DISTVERSION=	2023.04.01
+DISTVERSION=	2023.04.20
 CATEGORIES=	www
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	eric@camachat.org
 COMMENT=	Dooble Web Browser
 WWW=		https://textbrowser.github.io/dooble/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler:c++17-lang desktop-file-utils gl gmake qmake qt:5 ssl \
+FLAVORS=	qt5 qt6
+FLAVOR?=	${FLAVORS:[1]}
+qt5_CONFLICTS_INSTALL=	qt6
+qt6_CONFLICTS_INSTALL=	qt5
+
+USES=		compiler:c++17-lang desktop-file-utils gl gmake qmake qt:${FLAVOR:S/qt//} ssl \
 		tar xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	textbrowser
 USE_GL=		gl
+.if ${FLAVOR} == qt5
 USE_QT=		concurrent core declarative gui location network printsupport \
 		sql webchannel webengine widgets xml sql-sqlite3:run \
 		buildtools:build qmake:build
+. elif ${FLAVOR} == qt6
+USE_QT=		base charts webchannel webengine
+.endif
 USE_XORG=	xcb
 
 QMAKE_SOURCE_PATH=	${PORTNAME}.pro
 
 PLIST_FILES=	${PREFIX}/share/applications/${PORTNAME}.desktop \
 		${PREFIX}/share/pixmaps/${PORTNAME}.png \
 		bin/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
+.if ${FLAVOR:U} == qt5
 QT5_VER_MINOR=	${QT5_VERSION:C/^[0-9]+\.//:C/\..+$//}
 .if ${QT5_VER_MINOR} < 15
 BROKEN=		Qt 5.15 or higher required, using 5.${QT5_VER_MINOR} now
 .endif
+.endif
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/Dooble ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 		${INSTALL_DATA} ${WRKSRC}/Icons/Logo/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 		desktop-file-edit --remove-category=Web --add-category=Network --add-category=WebBrowser ${WRKSRC}/${PORTNAME}.desktop
-		desktop-file-edit --set-key=Exec --set-value=${PREFIX}/bin/${PORTNAME} ${WRKSRC}/${PORTNAME}.desktop
+		desktop-file-edit --set-key=Exec --set-value="/usr/bin/env QTWEBENGINE_DICTIONARIES_PATH=${QT_DATADIR}/qtwebengine_dictionaries ${PREFIX}/bin/${PORTNAME}" ${WRKSRC}/${PORTNAME}.desktop
 		desktop-file-edit --set-icon=${PREFIX}/share/pixmaps/${PORTNAME}.png ${WRKSRC}/${PORTNAME}.desktop
 		${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
 
 .include <bsd.port.post.mk>
diff --git a/www/dooble/distinfo b/www/dooble/distinfo
index 56f85a48e9fa..d8accc5d5559 100644
--- a/www/dooble/distinfo
+++ b/www/dooble/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680379072
-SHA256 (textbrowser-dooble-2023.04.01_GH0.tar.gz) = e5db6cec9e281a7a054c64f5211ed72606117407ea4bb939762ad297fa8a8f3b
-SIZE (textbrowser-dooble-2023.04.01_GH0.tar.gz) = 92588583
+TIMESTAMP = 1682008357
+SHA256 (textbrowser-dooble-2023.04.20_GH0.tar.gz) = 5425a5ad6753c08df061a8b78fa4aba035a915327d7b967eab3f0a6479eb869c
+SIZE (textbrowser-dooble-2023.04.20_GH0.tar.gz) = 93786166