diff --git a/japanese/qolibri/Makefile b/japanese/qolibri/Makefile
index 9e81e65a507d..75d308d9f705 100644
--- a/japanese/qolibri/Makefile
+++ b/japanese/qolibri/Makefile
@@ -1,26 +1,26 @@
-# created by: Osamu Matsuda <omatsuda000@gmail.com>
-
 PORTNAME=	qolibri
-DISTVERSION=	2.1.4
-PORTREVISION=	1
+DISTVERSION=	2.1.4-65
 CATEGORIES=	japanese
 
 MAINTAINER=	omatsuda000@gmail.com
 COMMENT=	EPWING dictionary viewer
 WWW=		https://github.com/ludios/qolibri/
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/License.txt
 
 LIB_DEPENDS=	libeb.so:japanese/eb
 
-USES=		cmake qt:5
-USE_QT=		buildtools core declarative gui linguisttools location \
-		multimedia network printsupport qmake webchannel webengine \
-		widgets
-
+USES=		cmake compiler:c++17-lang gl qt:6
 USE_GITHUB=	yes
 GH_ACCOUNT=	ludios
+GH_TAGNAME=	b29f1668d6e56030e531cd4e0e1ec58e370fede9
+USE_GL=		opengl
+USE_QT=		5compat base declarative multimedia positioning webchannel \
+		webengine tools:build
+
+CMAKE_ARGS=	-DQOLIBRI_USE_SYSTEM_EB=true
 
-PLIST_FILES=	bin/qolibri
+PLIST_FILES=	bin/qolibri share/applications/qolibri.desktop
 
 .include <bsd.port.mk>
diff --git a/japanese/qolibri/distinfo b/japanese/qolibri/distinfo
index bfaaae78bfbb..87cc4f56249c 100644
--- a/japanese/qolibri/distinfo
+++ b/japanese/qolibri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625444765
-SHA256 (ludios-qolibri-2.1.4_GH0.tar.gz) = 0163f19f80915879c5c276f48507aedfe5c186be3c57f965db5d68a9a7157150
-SIZE (ludios-qolibri-2.1.4_GH0.tar.gz) = 248244
+TIMESTAMP = 1784119999
+SHA256 (ludios-qolibri-2.1.4-65-b29f1668d6e56030e531cd4e0e1ec58e370fede9_GH0.tar.gz) = c7556281dc4d2e70487c823590bfe3eef4415f232f8b2603caa99aacc567f272
+SIZE (ludios-qolibri-2.1.4-65-b29f1668d6e56030e531cd4e0e1ec58e370fede9_GH0.tar.gz) = 253438
diff --git a/japanese/qolibri/pkg-message b/japanese/qolibri/pkg-message
new file mode 100644
index 000000000000..c72754019ac2
--- /dev/null
+++ b/japanese/qolibri/pkg-message
@@ -0,0 +1,9 @@
+[
+{ type: install
+  message: <<EOM
+Qt6 version silently convert settings to UTF-8. Running a Qt5 version
+afterwards corrupts all non-ASCII strings in settings. If unsure, backup
+your ~/.config/qolibri before running the new version.
+EOM
+}
+]