diff --git a/x11-wm/kwinft/Makefile b/x11-wm/kwinft/Makefile
index 9183ac80eb6b..589e24ca7e8c 100644
--- a/x11-wm/kwinft/Makefile
+++ b/x11-wm/kwinft/Makefile
@@ -1,65 +1,64 @@
 PORTNAME=	kwinft
 DISTVERSIONPREFIX=	${PORTNAME}@
-DISTVERSION=	5.24.0-beta.0
+DISTVERSION=	5.24.0
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
 PATCHFILES+=	1c81c5f3ef9a.patch:-p1 # https://gitlab.com/kwinft/kwinft/-/merge_requests/163
 PATCHFILES+=	a6d7bb9acfef.patch:-p1 # https://gitlab.com/kwinft/kwinft/-/merge_requests/164
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Wayland compositor and X11 window manager
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 		libwayland-server.so:graphics/wayland \
 		libWraplandServer.so:graphics/wrapland \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxcb-cursor.so:x11/xcb-util-cursor \
 		libxcb-image.so:x11/xcb-util-image \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxcb-icccm.so:x11/xcb-util-wm
 TEST_DEPENDS=	${qt-testlib_PORT:T}>0:${qt-testlib_PORT}
 
 CONFLICTS_INSTALL=	plasma5-kwin # bin/kwin_wayland
 
 USES=		cmake:testing gl kde:5 pkgconfig python:run qt:5 shebangfix xorg
 USE_GITLAB=	yes
 USE_GL=		egl
 USE_KDE=	ecm_build auth completion config configwidgets \
 		coreaddons crash dbusaddons decoration globalaccel i18n \
 		idletime kcmutils kdeclarative kio kscreenlocker newstuff \
 		notifications package plasma-framework service textwidgets \
 		widgetsaddons windowsystem xmlgui
 USE_LDCONFIG=	yes
 USE_QT=		qmake_build buildtools_build core dbus declarative gui \
 		multimedia_run quickcontrols2_run widgets x11extras
 USE_XORG=	pixman x11 xcb xi
 SHEBANG_FILES=	kconf_update/*.py kconf_update/*.pl
-GL_COMMIT=	9a706378af61d93fbacd0cd9dcd1b0be68bc6c70
+GL_COMMIT=	8d1c576db6061d963734b013cd10460155d73f6d
 PLIST_SUB=	VERSION=${PORTVERSION}
-PLIST_SUB=	VERSION=5.23.90 # XXX beta override
 LDFLAGS+=	-Wl,--as-needed # GL, ICE/SM/Xext, epoll-shim, glib, intl, Qt5*, KF5*
 
 OPTIONS_DEFINE=	BREEZE DOCS QA11Y
 OPTIONS_DEFAULT=BREEZE QA11Y
 
 BREEZE_DESC=		Default window decoration plugin
 BREEZE_USE=		KDE=breeze
 BREEZE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Breeze
 
 DOCS_USE=		KDE=doctools_build
 DOCS_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_KF5DocTools
 
 QA11Y_DESC=		Accessibility (focus tracking) for Zoom effect
 QA11Y_LIB_DEPENDS=	libqaccessibilityclient-qt5.so:accessibility/libqaccessibilityclient
 QA11Y_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_QAccessibilityClient
 
 .include <bsd.port.mk>
diff --git a/x11-wm/kwinft/distinfo b/x11-wm/kwinft/distinfo
index b8f02272597d..211c2266eadb 100644
--- a/x11-wm/kwinft/distinfo
+++ b/x11-wm/kwinft/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1643884701
-SHA256 (kwinft-kwinft-9a706378af61d93fbacd0cd9dcd1b0be68bc6c70_GL0.tar.gz) = fdf8b84c78f76c8791aee54d7f41f4c0628c849eb1aa312cd052817337ecbff1
-SIZE (kwinft-kwinft-9a706378af61d93fbacd0cd9dcd1b0be68bc6c70_GL0.tar.gz) = 4939124
+TIMESTAMP = 1644332936
+SHA256 (kwinft-kwinft-8d1c576db6061d963734b013cd10460155d73f6d_GL0.tar.gz) = e2bb3b60a47f1f0180c1e4986443c70037c672a81f2ed084c31111a053544239
+SIZE (kwinft-kwinft-8d1c576db6061d963734b013cd10460155d73f6d_GL0.tar.gz) = 4938543
 SHA256 (1c81c5f3ef9a.patch) = 34f01f456b0c7b8bf5d85629141995e18220a0439feec3fb324d2d47af7f3348
 SIZE (1c81c5f3ef9a.patch) = 1079
 SHA256 (a6d7bb9acfef.patch) = edfd447f8fd4827145bd1a2fa852c29bb01112f20bc208ce0997ce7b4de9b8db
 SIZE (a6d7bb9acfef.patch) = 5098