diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile
index 5e87ce42e6db..a855b79cebae 100644
--- a/deskutils/fet/Makefile
+++ b/deskutils/fet/Makefile
@@ -1,54 +1,57 @@
 PORTNAME=	fet
-DISTVERSION=	7.6.3
+DISTVERSION=	7.8.5
 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/
 
 MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Free timetabling software
 WWW=		https://lalescu.ro/liviu/fet/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		compiler:c++17-lang gl qmake qt:6 tar:bzip2
+USES=		cmake compiler:c++17-lang gl qt:6 tar:xz xorg
 USE_GL=		opengl
 USE_QT=		base
+USE_XORG=	ice x11 xcb
 
 DESKTOP_ENTRIES=	"FET" \
 			"Free timetable software" \
 			"" \
 			"fet" \
 			"Education;Qt;" \
 			true
 
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES NLS
 OPTIONS_SUB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \
 		${WRKSRC}/src/interface/fet.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fet ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/fet-cl ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/src/interface/fet \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/src/cl/fet-cl \
+		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/fet*.gz ${STAGEDIR}${PREFIX}/share/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
 
 do-test:
 	cd ${WRKSRC} && ${PREFIX}/bin/fet-cl --inputfile=${WRKSRC}/examples/official/by-Volker-Dirr/German_subact_constr.fet \
 		--randomseeds10=1 --randomseeds11=1 --randomseeds12=1 \
 		--randomseeds20=1 --randomseeds21=1 --randomseeds22=1
 
 .include <bsd.port.mk>
diff --git a/deskutils/fet/distinfo b/deskutils/fet/distinfo
index 27cc78e1f953..6c8ca66fa5bb 100644
--- a/deskutils/fet/distinfo
+++ b/deskutils/fet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1766956687
-SHA256 (fet-7.6.3.tar.bz2) = 5373f14f573784e5db5cf6c7146dc4adf7997f6bb07dec699018238a29c9693a
-SIZE (fet-7.6.3.tar.bz2) = 17869352
+TIMESTAMP = 1776336824
+SHA256 (fet-7.8.5.tar.xz) = 1529aac8bdef1b23df588ffcbff35f258d56eb3512d729727c29907f34a884c6
+SIZE (fet-7.8.5.tar.xz) = 13591300
diff --git a/deskutils/fet/files/patch-CMakeLists.txt b/deskutils/fet/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..74b8052ebea1
--- /dev/null
+++ b/deskutils/fet/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2026-01-20 12:24:20 UTC
++++ CMakeLists.txt
+@@ -101,7 +101,7 @@ install(FILES ${qm_files} DESTINATION "${CMAKE_INSTALL
+ endif()
+ 
+ install(FILES ${qm_files} DESTINATION "${CMAKE_INSTALL_DATADIR}/${fetdir}/translations")
+-install(DIRECTORY examples DESTINATION "${CMAKE_INSTALL_DATADIR}/${fetdir}")
++install(DIRECTORY examples DESTINATION "${CMAKE_INSTALL_DATADIR}/examples/${fetdir}")
+ install(DIRECTORY licenses DESTINATION "${CMAKE_INSTALL_DATADIR}/${docfetdir}")
+ install(DIRECTORY doc/adding-new-translations DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/${fetdir}")
+ install(DIRECTORY doc/algorithm DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/${fetdir}")