diff --git a/dolphin.spec b/dolphin.spec
index 0ce818f..1761bb2 100644
--- a/dolphin.spec
+++ b/dolphin.spec
@@ -6,10 +6,17 @@
 #global tests 1
 %endif
 
+%if 0%{?fedora} > 30
+## autostart 'dolphin --daemon' instead of relying on potentially unlreliable dbus-activation
+## https://bugzilla.redhat.com/1394927
+## https://bugzilla.redhat.com/1754395
+%global dolphin_autostart 1
+%endif
+
 Name:    dolphin
 Summary: KDE File Manager
 Version: 19.08.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 URL:     https://cgit.kde.org/%{name}.git/
@@ -107,6 +114,17 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang dolphin --all-name --with-html
 
+%if 0%{?dolphin_autostart}
+rm -fv %{buildroot}%{_datadir}/dbus-1/services/org.kde.dolphin.FileManager1.service
+install -m644 -p -D \
+  %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop \
+  %{buildroot}%{_kf5_sysconfdir}/xdg/autostart/org.kde.%{name}.desktop
+desktop-file-edit \
+  --add-only-show-in=KDE \
+  --set-key=Exec --set-value="dolphin --daemon" \
+  %{buildroot}%{_kf5_sysconfdir}/xdg/autostart/org.kde.%{name}.desktop
+%endif
+
 
 %check
 appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml ||:
@@ -128,7 +146,11 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||:
 %{_kf5_libdir}/libkdeinit5_dolphin.so
 %{_kf5_datadir}/kservices5/kcmdolphin*.desktop
 %{_kf5_datadir}/config.kcfg/dolphin_*
+%if %{?dolphin_autostart}
+%{_kf5_sysconfdir}/xdg/autostart/org.kde.%{name}.desktop
+%else
 %{_datadir}/dbus-1/services/org.kde.dolphin.FileManager1.service
+%endif
 %{_kf5_metainfodir}/org.kde.%{name}.appdata.xml
 %{_kf5_datadir}/applications/org.kde.%{name}.desktop
 %dir %{_kf5_datadir}/kglobalaccel/
@@ -156,6 +178,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||:
 
 
 %changelog
+* Thu Oct 17 2019 Rex Dieter <rdieter@fedoraproject.org> - 19.08.2-2
+- autostart dolphin on login, remove dbus activation, f31+ (#1394927,#1754395)
+
 * Thu Oct 17 2019 Rex Dieter <rdieter@fedoraproject.org> - 19.08.2-1
 - 19.08.2