diff --git a/games/pentobi/Makefile b/games/pentobi/Makefile
index 28879eb7abca..18d73edacf86 100644
--- a/games/pentobi/Makefile
+++ b/games/pentobi/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	pentobi
-PORTVERSION=	21.0
+PORTVERSION=	22.0
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Computer opponent for the board game Blokus
-WWW=		https://pentobi.sourceforge.io/
+WWW=		https://pentobi.sourceforge.io/ \
+		https://github.com/enz/pentobi
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
@@ -14,27 +15,19 @@ BUILD_DEPENDS=	itstool:textproc/itstool \
 		xsltproc:textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
-USES=		compiler:c++14-lang cmake desktop-file-utils gettext-tools gnome qt:5 \
+USES=		compiler:c++14-lang cmake desktop-file-utils gettext-tools gnome qt:6 \
 		shared-mime-info tar:xz
 USE_GNOME=	librsvg2:build
-USE_QT=		core gui concurrent quickcontrols2 declarative network \
-		qmake:build buildtools:build linguisttools:build
-CMAKE_ARGS=	-DDOCBOOK_XSL=${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl
+USE_QT=		base declarative tools:build
 
 PORTDATA=	*
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	DOCS TEST GNOME KDE
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	DOCS TEST
+OPTIONS_DEFAULT=TEST
 
 TEST_CMAKE_BOOL=	BUILD_TESTING
 TEST_TEST_TARGET=	test
-GNOME_DESC=		Build Gnome thumbnailer
-GNOME_CMAKE_BOOL=	PENTOBI_BUILD_THUMBNAILER
-KDE_CMAKE_BOOL=		PENTOBI_BUILD_KDE_THUMBNAILER
-KDE_USES=		kde:5
-KDE_USE=		KDE=kio
-KDE_DESC=		Build KDE thumbnailer
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/games/pentobi/distinfo b/games/pentobi/distinfo
index 77599d2e4a1e..0c141ac59090 100644
--- a/games/pentobi/distinfo
+++ b/games/pentobi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1668530865
-SHA256 (pentobi-21.0.tar.xz) = 04019e7b1ff074bb792f950f91b93e8463303e278897bd56e1073a3e85499e22
-SIZE (pentobi-21.0.tar.xz) = 471924
+TIMESTAMP = 1674739457
+SHA256 (pentobi-22.0.tar.xz) = 14d5dd5dd486c5f0c9fd1288f1d2b8928f75e921c4e5943880a48944266da82c
+SIZE (pentobi-22.0.tar.xz) = 470204
diff --git a/games/pentobi/pkg-plist b/games/pentobi/pkg-plist
index 50270254050b..1c8b5794a533 100644
--- a/games/pentobi/pkg-plist
+++ b/games/pentobi/pkg-plist
@@ -1,14 +1,5 @@
 bin/pentobi
-%%GNOME%%bin/pentobi-thumbnailer
-%%KDE%%%%QT_PLUGINDIR%%/pentobi-thumbnail.so
-%%GNOME%%share/man/de/man6/pentobi-thumbnailer.6.gz
-%%GNOME%%share/man/es/man6/pentobi-thumbnailer.6.gz
-%%GNOME%%share/man/man6/pentobi-thumbnailer.6.gz
-%%GNOME%%share/man/ru/man6/pentobi-thumbnailer.6.gz
-share/man/de/man6/pentobi.6.gz
-share/man/es/man6/pentobi.6.gz
-share/man/man6/pentobi.6.gz
-share/man/ru/man6/pentobi.6.gz
+bin/pentobi-thumbnailer
 share/applications/io.sourceforge.pentobi.desktop
 share/icons/hicolor/128x128/apps/pentobi.png
 share/icons/hicolor/128x128/mimetypes/application-x-blokus-sgf.png
@@ -28,7 +19,14 @@ share/icons/hicolor/64x64/apps/pentobi.png
 share/icons/hicolor/64x64/mimetypes/application-x-blokus-sgf.png
 share/icons/hicolor/scalable/apps/pentobi.svg
 share/icons/hicolor/scalable/mimetypes/application-x-blokus-sgf.svg
-%%KDE%%share/kservices5/pentobi-thumbnail.desktop
+share/man/de/man6/pentobi-thumbnailer.6.gz
+share/man/de/man6/pentobi.6.gz
+share/man/es/man6/pentobi-thumbnailer.6.gz
+share/man/es/man6/pentobi.6.gz
+share/man/man6/pentobi-thumbnailer.6.gz
+share/man/man6/pentobi.6.gz
+share/man/ru/man6/pentobi-thumbnailer.6.gz
+share/man/ru/man6/pentobi.6.gz
 share/metainfo/io.sourceforge.pentobi.appdata.xml
 share/mime/packages/pentobi-mime.xml
-%%GNOME%%share/thumbnailers/pentobi.thumbnailer
+share/thumbnailers/pentobi.thumbnailer