diff --git a/bluez.spec b/bluez.spec
index 2399c4c..113d6ad 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.94
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -195,18 +195,8 @@ if [ $1 -ge 1 ] ; then
         /bin/systemctl try-restart bluetooth.service >/dev/null 2>&1 || :
 fi
 
-%triggerun -- bluez < 4.78
-if /sbin/chkconfig --level 3 bluetooth ; then
-        /bin/systemctl enable bluetooth.service >/dev/null 2>&1 || :
-fi
-
-%triggerun -- bluez < 4.87-3
-if /bin/systemctl is-enabled bluetooth.service >/dev/null 2>&1 ; then
-        # Starting with bluez 4.87-3 the D-Bus symlink is required to
-        # make bus activation work. Let's add it in, in case bluez was
-        # enabled already.
-        ln -s /lib/systemd/system/bluetooth.service /etc/systemd/system/dbus-org.bluez.service >/dev/null 2>&1 || :
-fi
+%triggerun -- bluez < 4.94-4
+/bin/systemctl --no-reload enable bluetooth.service >/dev/null 2>&1 || :
 
 %post compat
 /sbin/chkconfig --add dund
@@ -297,6 +287,9 @@ fi
 %{_mandir}/man1/pand.1.gz
 
 %changelog
+* Tue Jun 28 2011 Lennart Poettering <lpoetter@redhat.com> - 4.94-4
+- Enable bluetoothd on all upgrades from 4.87-6 and older, in order to fix up broken F15 installations
+
 * Thu Jun 23 2011 Bastien Nocera <bnocera@redhat.com> 4.94-3
 - Update patches to apply correctly
 - First compilable version with hostnamed support