diff --git a/kf5.spec b/kf5.spec
index b6bb607..ff881fc 100644
--- a/kf5.spec
+++ b/kf5.spec
@@ -1,6 +1,6 @@
 Name:    kf5
 Version: 5.110.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Filesystem and RPM macros for KDE Frameworks 5
 License: BSD
 URL:     http://www.kde.org
@@ -12,6 +12,9 @@ Filesystem and RPM macros for KDE Frameworks 5
 
 %package filesystem
 Summary: Filesystem for KDE Frameworks 5
+%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
+Requires: kde-filesystem >= 5
+%endif
 # noarch -> arch transition
 Obsoletes: kf5-filesystem < 5.10.0-2
 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
@@ -42,17 +45,20 @@ RPM macros for building KDE Frameworks 5 packages.
 %install
 # See macros.kf5 where the directories are specified
 mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/plugins/kf5/
-mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/kconf_update_bin
 mkdir -p %{buildroot}%{_includedir}/KF5
-mkdir -p %{buildroot}%{_datadir}/{config.kcfg,kconf_update,kf5,kservicetypes5}
-mkdir -p %{buildroot}%{_datadir}/kpackage/{genericqml,kcms}
+mkdir -p %{buildroot}%{_datadir}/{kf5,kservicetypes5}
 mkdir -p %{buildroot}%{_datadir}/kservices5/ServiceMenus
-mkdir -p %{buildroot}%{_datadir}/knsrcfiles/
 mkdir -p %{buildroot}%{_datadir}/qlogging-categories5/
-mkdir -p %{buildroot}%{_datadir}/solid/{actions,devices}
 mkdir -p %{buildroot}%{_docdir}/qt5
 mkdir -p %{buildroot}%{_libexecdir}/kf5
+%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10)
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/kconf_update_bin
+mkdir -p %{buildroot}%{_datadir}/{config.kcfg,kconf_update}
+mkdir -p %{buildroot}%{_datadir}/kpackage/{genericqml,kcms}
+mkdir -p %{buildroot}%{_datadir}/knsrcfiles/
+mkdir -p %{buildroot}%{_datadir}/solid/{actions,devices}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown}
+%endif
 
 install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5
 sed -i \
@@ -64,29 +70,34 @@ sed -i \
 
 
 %files filesystem
-%{_sysconfdir}/xdg/plasma-workspace/
 %{_prefix}/lib/qt5/plugins/kf5/
 %{_prefix}/%{_lib}/qt5/plugins/kf5/
-%{_prefix}/lib/kconf_update_bin/
-%{_prefix}/%{_lib}/kconf_update_bin/
 %{_includedir}/KF5/
 %{_libexecdir}/kf5/
-%{_datadir}/config.kcfg/
-%{_datadir}/kconf_update/
 %{_datadir}/kf5/
-%{_datadir}/kpackage/
 %{_datadir}/kservices5/
 %{_datadir}/kservicetypes5/
-%{_datadir}/knsrcfiles/
 %{_datadir}/qlogging-categories5/
-%{_datadir}/solid/
 %{_docdir}/qt5/
+%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10)
+%{_sysconfdir}/xdg/plasma-workspace/
+%{_prefix}/lib/kconf_update_bin/
+%{_prefix}/%{_lib}/kconf_update_bin/
+%{_datadir}/config.kcfg/
+%{_datadir}/kconf_update/
+%{_datadir}/kpackage/
+%{_datadir}/knsrcfiles/
+%{_datadir}/solid/
+%endif
 
 %files rpm-macros
 %{_rpmconfigdir}/macros.d/macros.kf5
 
 
 %changelog
+* Thu Sep 14 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 5.110.0-2
+- Use kde-filesystem for unversioned directories in F40+
+
 * Tue Sep 05 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.110.0-1
 - 5.110.0