diff --git a/baloo_file_shutdown.sh b/baloo_file_shutdown.sh
new file mode 100644
index 0000000..7b6d202
--- /dev/null
+++ b/baloo_file_shutdown.sh
@@ -0,0 +1,7 @@
+
+# workaround for baloo_file processes persisting
+# after logout, parent bug:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1861700
+
+qdbus-qt5 org.kde.baloo >& /dev/null && \
+qdbus-qt5 org.kde.baloo / org.kde.baloo.quit ||:
diff --git a/kf5-baloo.spec b/kf5-baloo.spec
index 222bc5c..5213e5b 100644
--- a/kf5-baloo.spec
+++ b/kf5-baloo.spec
@@ -11,7 +11,7 @@
 Name:    kf5-%{framework}
 Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality
 Version: 5.73.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # libs are LGPL, tools are GPL
 # KDE e.V. may determine that future LGPL/GPL versions are accepted
@@ -29,6 +29,8 @@ URL:     https://community.kde.org/Baloo
 Source0:        http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
 
 Source1:        97-kde-baloo-filewatch-inotify.conf
+# shutdown script to explictly stop baloo_file on logout
+Source2:        baloo_file_shutdown.sh
 
 ## upstreamable patches
 # http://bugzilla.redhat.com/1235026
@@ -126,6 +128,7 @@ License:        LGPLv2 or LGPLv3
 rm -fv %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/baloodb5.*
 
 install -p -m644 -D %{SOURCE1} %{buildroot}%{_prefix}/lib/sysctl.d/97-kde-baloo-filewatch-inotify.conf
+install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/shutdown/baloo_file.sh
 
 %find_lang kio5_baloosearch
 %find_lang kio5_tags
@@ -168,6 +171,7 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
 
 %files file -f %{name}-file.lang
 %{_prefix}/lib/sysctl.d/97-kde-baloo-filewatch-inotify.conf
+%{_sysconfdir}/xdg/plasma-workspace/shutdown/baloo_file.sh
 %{_kf5_bindir}/baloo_file
 %{_kf5_bindir}/baloo_file_extractor
 %{_kf5_sysconfdir}/xdg/autostart/baloo_file.desktop
@@ -200,6 +204,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
 
 
 %changelog
+* Mon Sep 14 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.73.0-2
+- add explicit shutdown script for baloo_file (parent bug #1861700)
+
 * Mon Aug 03 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.73.0-1
 - 5.73.0