diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile
index 533c927426..fd728bc236 100644
--- a/deskutils/fet/Makefile
+++ b/deskutils/fet/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	fet
-DISTVERSION=	6.8.7
+DISTVERSION=	6.9.0
 CATEGORIES=	deskutils education
 MASTER_SITES=	https://lalescu.ro/liviu/fet/download/ \
 		https://lalescu.ro/liviu/fet/download/old/ \
 		https://timetabling.de/download/ \
 		https://timetabling.de/download/old/
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	uzsolt@uzsolt.hu
 COMMENT=	Free timetabling software
@@ -13,11 +14,15 @@ WWW=		https://lalescu.ro/liviu/fet/
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		compiler:c++14-lang gl qmake qt:5 tar:bzip2
-USE_GL=		gl
-USE_QT=		core printsupport widgets buildtools:build
+FLAVORS=	qt5 qt6
+FLAVOR?=	qt6
+CONFLICTS_INSTALL=	${FLAVORS:@fl@fet-${fl}@}
 
-INSTALL_TARGET=	${WRKSRC}/fet-cl
+USES=		compiler:c++14-lang gl qmake qt:${FLAVOR:S/qt//} tar:bzip2
+USE_GL=		gl
+_USE_QT5=	core gui network printsupport widgets buildtools:build
+_USE_QT6=	base
+USE_QT=		${_USE_QT${FLAVOR:S/qt//}}
 
 DESKTOP_ENTRIES=	"FET" \
 			"Free timetable software" \
@@ -28,21 +33,15 @@ DESKTOP_ENTRIES=	"FET" \
 
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	EXAMPLES NLS ONLYCL
+OPTIONS_DEFINE=	EXAMPLES NLS
 OPTIONS_SUB=	yes
 
-ONLYCL_DESC=	Build only command line version (without Qt GUI)
-
-ONLYCL_VARS=		QMAKE_SOURCE_PATH=${WRKSRC}/src/src-cl.pro
-ONLYCL_VARS_OFF=	INSTALL_TARGET+=${WRKSRC}/fet \
-			USE_QT+="gui network"
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \
 		${WRKSRC}/src/interface/fet.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${INSTALL_TARGET} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/fet ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/fet-cl ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/fet*.gz ${STAGEDIR}${MANPREFIX}/man/man1
 
diff --git a/deskutils/fet/distinfo b/deskutils/fet/distinfo
index bb5a4bbae1..7221f26386 100644
--- a/deskutils/fet/distinfo
+++ b/deskutils/fet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679062403
-SHA256 (fet-6.8.7.tar.bz2) = 35b8657b2cfc2fea4f039fb9028c0fb2505d2184c7aae23f903b38fc98169471
-SIZE (fet-6.8.7.tar.bz2) = 18844884
+TIMESTAMP = 1680876722
+SHA256 (fet-6.9.0.tar.bz2) = daf39231f7c9e4ca99c0540f2e4a78172513044db35266bfc3b0d1a01e2adcd2
+SIZE (fet-6.9.0.tar.bz2) = 18857314
diff --git a/deskutils/fet/pkg-plist b/deskutils/fet/pkg-plist
index 142607ba20..76777fe48f 100644
--- a/deskutils/fet/pkg-plist
+++ b/deskutils/fet/pkg-plist
@@ -1,4 +1,4 @@
-%%NO_ONLYCL%%bin/fet
+bin/fet
 bin/fet-cl
 man/man1/fet-cl.1.gz
 man/man1/fet.1.gz