diff --git a/bluedevil.spec b/bluedevil.spec
index b257581..49bd7d1 100644
--- a/bluedevil.spec
+++ b/bluedevil.spec
@@ -2,7 +2,7 @@
 Name:           bluedevil
 Summary:        Bluetooth stack for KDE
 Version:        2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPLv2+
 URL:            https://projects.kde.org/projects/extragear/base/bluedevil
@@ -31,6 +31,12 @@ Requires:       pulseaudio-module-bluetooth
 %description
 BlueDevil is the bluetooth stack for KDE.
 
+%package autostart
+Summary: Autostart support for non-KDE desktops
+Requires: %{name} = %{version}-%{release}
+%description autostart
+%{summary}.
+
 
 %prep
 %autosetup -n %{name}-%{version}%{?pre:-%{pre}} -p1
@@ -50,12 +56,17 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang %{name} --with-kde
 
+desktop-file-install \
+  --dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \
+  --add-not-show-in=KDE \
+  %{buildroot}%{_kde4_datadir}/applications/kde4/bluedevil-monolithic.desktop
+
 
 %check
-# FIXME: .desktop files need some mime/Categories love to validate properly -- Rex
-for desktop_file in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
-desktop-file-validate ${desktop_file} ||:
-done
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/bluedevil-monolithic.desktop
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/bluedevil-sendfile.desktop
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/bluedevil-wizard.desktop
+
 
 %post
 touch --no-create %{_kde4_datadir}/mime/packages &> /dev/null || :
@@ -78,17 +89,27 @@ update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || :
 %{_kde4_bindir}/bluedevil-monolithic
 %{_kde4_bindir}/bluedevil-sendfile
 %{_kde4_bindir}/bluedevil-wizard
-%{_kde4_datadir}/applications/kde4/*.desktop
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/applications/kde4/bluedevil-monolithic.desktop
+%{_kde4_datadir}/applications/kde4/bluedevil-sendfile.desktop
+%{_kde4_datadir}/applications/kde4/bluedevil-wizard.desktop
+%{_kde4_datadir}/kde4/services/bluedevil*.desktop
+%{_kde4_datadir}/kde4/services/*.protocol
+%{_kde4_datadir}/kde4/services/kded/*.desktop
 %{_kde4_datadir}/mime/packages/bluedevil-mime.xml
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
 %{_kde4_libexecdir}/bluedevil-authorize
 %{_kde4_libexecdir}/bluedevil-confirmmodechange
 %{_kde4_libexecdir}/bluedevil-requestconfirmation
 %{_kde4_libexecdir}/bluedevil-requestpin
 
+%files autostart
+%{_sysconfdir}/xdg/autostart/bluedevil-monolithic.desktop
+
 
 %changelog
+* Fri Jan 16 2015 Rex Dieter <rdieter@fedoraproject.org> 2.1-2
+- -autostart: Autostart support for non-KDE environments (#1008602)
+
 * Tue Dec 23 2014 Rex Dieter <rdieter@fedoraproject.org> 2.1-1
 - 2.1