diff --git a/61-gnome-bluetooth-rfkill.rules b/61-gnome-bluetooth-rfkill.rules
index 6789539..a76c1e7 100644
--- a/61-gnome-bluetooth-rfkill.rules
+++ b/61-gnome-bluetooth-rfkill.rules
@@ -1,3 +1,11 @@
 # Get access to /dev/rfkill for users
 # See https://bugzilla.redhat.com/show_bug.cgi?id=514798
-KERNEL=="rfkill", ENV{ACL_MANAGE}="1"
+#
+# Updated for udev >= 154
+# http://bugs.debian.org/582188
+# https://bugzilla.redhat.com/show_bug.cgi?id=588660
+
+ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end"
+ACTION!="add|change", GOTO="gnome_bluetooth_end"
+KERNEL=="rfkill", TAG+="udev-acl"
+LABEL="gnome_bluetooth_end"
diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index 7c12ae3..2f032a7 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.30.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -223,6 +223,10 @@ fi
 %{_bindir}/bluetooth-panel
 
 %changelog
+* Thu Jun 03 2010 Bastien Nocera <bnocera@redhat.com> 2.30.0-2
+- Fix /dev/rfkill permissions when using newer udev >= 154 (#588660)
+  (with thanks to Sven Arvidsson and Debian)
+
 * Mon Mar 29 2010 Bastien Nocera <bnocera@redhat.com> 2.30.0-1
 - Update to 2.30.0