diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile
index 533c9274261f..fd728bc236e4 100644
--- a/deskutils/fet/Makefile
+++ b/deskutils/fet/Makefile
@@ -1,57 +1,56 @@
 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
 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" \
 			"" \
 			"fet" \
 			"Education;Qt;" \
 			true
 
 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
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 do-install-NLS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
 	cd ${WRKSRC}/translations && ${INSTALL_DATA} *.qm ${STAGEDIR}${DATADIR}/translations
 
 .include <bsd.port.mk>
diff --git a/deskutils/fet/distinfo b/deskutils/fet/distinfo
index bb5a4bbae165..7221f2638674 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 142607ba20e5..76777fe48f6f 100644
--- a/deskutils/fet/pkg-plist
+++ b/deskutils/fet/pkg-plist
@@ -1,41 +1,41 @@
-%%NO_ONLYCL%%bin/fet
+bin/fet
 bin/fet-cl
 man/man1/fet-cl.1.gz
 man/man1/fet.1.gz
 %%NLS%%%%DATADIR%%/translations/fet_ar.qm
 %%NLS%%%%DATADIR%%/translations/fet_bg.qm
 %%NLS%%%%DATADIR%%/translations/fet_ca.qm
 %%NLS%%%%DATADIR%%/translations/fet_cs.qm
 %%NLS%%%%DATADIR%%/translations/fet_da.qm
 %%NLS%%%%DATADIR%%/translations/fet_de.qm
 %%NLS%%%%DATADIR%%/translations/fet_el.qm
 %%NLS%%%%DATADIR%%/translations/fet_en_GB.qm
 %%NLS%%%%DATADIR%%/translations/fet_es.qm
 %%NLS%%%%DATADIR%%/translations/fet_eu.qm
 %%NLS%%%%DATADIR%%/translations/fet_fa.qm
 %%NLS%%%%DATADIR%%/translations/fet_fr.qm
 %%NLS%%%%DATADIR%%/translations/fet_gl.qm
 %%NLS%%%%DATADIR%%/translations/fet_he.qm
 %%NLS%%%%DATADIR%%/translations/fet_hu.qm
 %%NLS%%%%DATADIR%%/translations/fet_id.qm
 %%NLS%%%%DATADIR%%/translations/fet_it.qm
 %%NLS%%%%DATADIR%%/translations/fet_ja.qm
 %%NLS%%%%DATADIR%%/translations/fet_lt.qm
 %%NLS%%%%DATADIR%%/translations/fet_mk.qm
 %%NLS%%%%DATADIR%%/translations/fet_ms.qm
 %%NLS%%%%DATADIR%%/translations/fet_nl.qm
 %%NLS%%%%DATADIR%%/translations/fet_pl.qm
 %%NLS%%%%DATADIR%%/translations/fet_pt_BR.qm
 %%NLS%%%%DATADIR%%/translations/fet_ro.qm
 %%NLS%%%%DATADIR%%/translations/fet_ru.qm
 %%NLS%%%%DATADIR%%/translations/fet_si.qm
 %%NLS%%%%DATADIR%%/translations/fet_sk.qm
 %%NLS%%%%DATADIR%%/translations/fet_sr.qm
 %%NLS%%%%DATADIR%%/translations/fet_sq.qm
 %%NLS%%%%DATADIR%%/translations/fet_tr.qm
 %%NLS%%%%DATADIR%%/translations/fet_uk.qm
 %%NLS%%%%DATADIR%%/translations/fet_untranslated.qm
 %%NLS%%%%DATADIR%%/translations/fet_uz.qm
 %%NLS%%%%DATADIR%%/translations/fet_vi.qm
 %%NLS%%%%DATADIR%%/translations/fet_zh_CN.qm
 %%NLS%%%%DATADIR%%/translations/fet_zh_TW.qm