--- a/etc/dbus-1/system.d/hal.conf.orig	2008-12-07 15:20:05.843410812 -0600
+++ b/etc/dbus-1/system.d/hal.conf	2008-12-07 15:23:34.677997206 -0600
@@ -23,10 +23,6 @@
     <allow receive_interface="org.freedesktop.Hal.Device"
            receive_sender="org.freedesktop.Hal"/>
 
-    <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
-    <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
-    <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
-    <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
     <allow receive_interface="org.freedesktop.Hal.Device.SystemPowerManagement"
 	   receive_sender="org.freedesktop.Hal"/>
     <allow receive_interface="org.freedesktop.Hal.Device.LaptopPanel"
@@ -37,12 +33,19 @@
 	   receive_sender="org.freedesktop.Hal"/>
   </policy>
 
-  <!-- Default policy for the exported interfaces; if PolicyKit is not used
-       for access control you will need to modify this -->
-  <policy context="default">
+  <!-- Allow members of 'power' group to shutdown/restart/suspend/hibernate -->
+  <policy group="power">
     <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
+  </policy>
+
+  <!-- Allow members of 'video' group to manipulate video settings -->
+  <policy group="video">
     <allow send_interface="org.freedesktop.Hal.Device.VideoAdapterPM"/>
     <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
+  </policy>
+
+  <!-- Allow members of 'plugdev' group to mount volumes -->
+  <policy group="plugdev">
     <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
     <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
   </policy>