diff --git a/x11-toolkits/kf6-kguiaddons/Makefile b/x11-toolkits/kf6-kguiaddons/Makefile
index 943c67c9b5fb..ffd1dc882304 100644
--- a/x11-toolkits/kf6-kguiaddons/Makefile
+++ b/x11-toolkits/kf6-kguiaddons/Makefile
@@ -1,18 +1,25 @@
 PORTNAME=	kguiaddons
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits kde kde-frameworks
 
 COMMENT=	Utilities for graphical user interfaces
 MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		cmake desktop-file-utils gl kde:6 pkgconfig qt:6 tar:xz xorg
 USE_GL=		gl opengl
-USE_KDE=	ecm:build \
-		plasma-wayland-protocols:build
+USE_KDE=	ecm:build plasma-wayland-protocols:build
 USE_QT=		base wayland
 USE_XORG=	x11 xcb
 
+OPTIONS_DEFINE=		KF5COMPAT
+KF5COMPAT_DESC=		Allow for co-instability with KF5
+KF5COMPAT_CMAKE_BOOL_OFF=	BUILD_GEO_SCHEME_HANDLER
+KF5COMPAT_RUN_DEPENDS=	kde-geo-uri-handler:x11-toolkits/kf5-kguiaddons
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_SUB=		YES
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/kf6-kguiaddons/pkg-plist b/x11-toolkits/kf6-kguiaddons/pkg-plist
index de853a8f5070..9ada2b8e2cc5 100644
--- a/x11-toolkits/kf6-kguiaddons/pkg-plist
+++ b/x11-toolkits/kf6-kguiaddons/pkg-plist
@@ -1,47 +1,47 @@
-bin/kde-geo-uri-handler
+%%NO_KF5COMPAT%%bin/kde-geo-uri-handler
 include/KF6/KGuiAddons/KColorCollection
 include/KF6/KGuiAddons/KColorMimeData
 include/KF6/KGuiAddons/KColorSchemeWatcher
 include/KF6/KGuiAddons/KColorUtils
 include/KF6/KGuiAddons/KCountryFlagEmojiIconEngine
 include/KF6/KGuiAddons/KCursorSaver
 include/KF6/KGuiAddons/KDateValidator
 include/KF6/KGuiAddons/KFontUtils
 include/KF6/KGuiAddons/KIconUtils
 include/KF6/KGuiAddons/KImageCache
 include/KF6/KGuiAddons/KJobWindows
 include/KF6/KGuiAddons/KKeySequenceRecorder
 include/KF6/KGuiAddons/KModifierKeyInfo
 include/KF6/KGuiAddons/KSystemClipboard
 include/KF6/KGuiAddons/KWordWrap
 include/KF6/KGuiAddons/kcolorcollection.h
 include/KF6/KGuiAddons/kcolormimedata.h
 include/KF6/KGuiAddons/kcolorschemewatcher.h
 include/KF6/KGuiAddons/kcolorutils.h
 include/KF6/KGuiAddons/kcountryflagemojiiconengine.h
 include/KF6/KGuiAddons/kcursorsaver.h
 include/KF6/KGuiAddons/kdatevalidator.h
 include/KF6/KGuiAddons/kfontutils.h
 include/KF6/KGuiAddons/kguiaddons_export.h
 include/KF6/KGuiAddons/kguiaddons_version.h
 include/KF6/KGuiAddons/kiconutils.h
 include/KF6/KGuiAddons/kimagecache.h
 include/KF6/KGuiAddons/kjobwindows.h
 include/KF6/KGuiAddons/kkeysequencerecorder.h
 include/KF6/KGuiAddons/klocalimagecacheimpl.h
 include/KF6/KGuiAddons/kmodifierkeyinfo.h
 include/KF6/KGuiAddons/kmodifierkeyinfoprovider_p.h
 include/KF6/KGuiAddons/ksystemclipboard.h
 include/KF6/KGuiAddons/kwordwrap.h
 lib/cmake/KF6GuiAddons/KF6GuiAddonsConfig.cmake
 lib/cmake/KF6GuiAddons/KF6GuiAddonsConfigVersion.cmake
 lib/cmake/KF6GuiAddons/KF6GuiAddonsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/KF6GuiAddons/KF6GuiAddonsTargets.cmake
 lib/libKF6GuiAddons.so
 lib/libKF6GuiAddons.so.%%KDE_FRAMEWORKS_VERSION%%
 lib/libKF6GuiAddons.so.6
-share/applications/google-maps-geo-handler.desktop
-share/applications/openstreetmap-geo-handler.desktop
-share/applications/qwant-maps-geo-handler.desktop
-share/applications/wheelmap-geo-handler.desktop
+%%NO_KF5COMPAT%%share/applications/google-maps-geo-handler.desktop
+%%NO_KF5COMPAT%%share/applications/openstreetmap-geo-handler.desktop
+%%NO_KF5COMPAT%%share/applications/qwant-maps-geo-handler.desktop
+%%NO_KF5COMPAT%%share/applications/wheelmap-geo-handler.desktop
 share/qlogging-categories6/kguiaddons.categories