diff --git a/kf5-kwallet.spec b/kf5-kwallet.spec
index 886361e..fe30e08 100644
--- a/kf5-kwallet.spec
+++ b/kf5-kwallet.spec
@@ -1,3 +1,5 @@
+%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10]
+
 %undefine __cmake_in_source_build
 %global framework kwallet
 
@@ -10,7 +12,7 @@
 
 Name:    kf5-%{framework}
 Version: 5.111.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE Frameworks 5 Tier 3 solution for password management
 
 License: LGPLv2+
@@ -84,7 +86,8 @@ developing applications that use %{name}.
 
 %build
 %{cmake_kf5} \
-  -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
+  -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} \
+  %{?with_kf6_compat:-DBUILD_KWALLETD=OFF}
 %cmake_build
 
 
@@ -105,11 +108,13 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
 %doc README.md
 %license LICENSES/*.txt
 %{_kf5_datadir}/qlogging-categories5/%{framework}*
+%if %{without kf6_compat}
 %{_kf5_datadir}/dbus-1/services/org.kde.kwalletd5.service
 %{_kf5_bindir}/kwalletd5
 %{_kf5_datadir}/kservices5/kwalletd5.desktop
 %{_kf5_datadir}/applications/org.kde.kwalletd5.desktop
 %{_kf5_datadir}/knotifications5/kwalletd5.notifyrc
+%endif
 %{_kf5_bindir}/kwallet-query
 %{_mandir}/man1/kwallet-query.1*
 
@@ -117,7 +122,9 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
 
 %files libs
 %{_kf5_libdir}/libKF5Wallet.so.*
+%if %{without kf6_compat}
 %{_kf5_libdir}/libkwalletbackend5.so.*
+%endif
 
 %files devel
 %{_kf5_datadir}/dbus-1/interfaces/kf5_org.kde.KWallet.xml
@@ -125,11 +132,16 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
 %{_kf5_includedir}/KWallet/
 %{_kf5_libdir}/cmake/KF5Wallet/
 %{_kf5_libdir}/libKF5Wallet.so
+%if %{without kf6_compat}
 %{_kf5_libdir}/libkwalletbackend5.so
+%endif
 %{_kf5_archdatadir}/mkspecs/modules/qt_KWallet.pri
 
 
 %changelog
+* Thu Oct 12 2023 Alessandro Astone <ales.astone@gmail.com> - 5.111.0-2
+- Add KF6 compatibility flag
+
 * Tue Oct 10 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.111.0-1
 - 5.111.0