diff --git a/packages/sysutils/hal/install b/packages/sysutils/hal/install
index e67b49b6ab..bc6049dee5 100755
--- a/packages/sysutils/hal/install
+++ b/packages/sysutils/hal/install
@@ -8,9 +8,10 @@ $SCRIPTS/install udev
 $SCRIPTS/install dbus
 $SCRIPTS/install dbus-glib
 $SCRIPTS/install gettext
+$SCRIPTS/install util-linux-ng
 
-  add_user haldaemon x 68 68 "HAL daemon" "/" "/bin/sh"
-  add_group haldaemon 68
+add_user haldaemon x 68 68 "HAL daemon" "/" "/bin/sh"
+add_group haldaemon 68
 
 mkdir -p $INSTALL/usr/sbin
   cp $PKG_BUILD/hald/hald $INSTALL/usr/sbin/
@@ -28,6 +29,7 @@ mkdir -p $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/libexec
   cp $PKG_BUILD/tools/.libs/hal-storage-mount $INSTALL/usr/libexec
+  cp $PKG_BUILD/tools/.libs/hal-storage-unmount $INSTALL/usr/libexec
   cp $PKG_BUILD/tools/.libs/hal-storage-eject $INSTALL/usr/libexec
   cp $PKG_BUILD/tools/.libs/hal-storage-closetray $INSTALL/usr/libexec
   cp $PKG_BUILD/tools/.libs/hal-storage-cleanup-mountpoint $INSTALL/usr/libexec
@@ -46,8 +48,8 @@ mkdir -p $INSTALL/usr/lib
   cp -PR $PKG_BUILD/libhal-storage/.libs/libhal-storage.so* $INSTALL/usr/lib
   rm -rf $INSTALL/usr/lib/libhal-storage.so*T
 
-mkdir -p $INSTALL/etc/udev/rules.d
-  cp $PKG_BUILD/tools/linux/90-hal.rules $INSTALL/etc/udev/rules.d
+mkdir -p $INSTALL/lib/udev/rules.d
+  cp $PKG_BUILD/tools/linux/90-hal.rules $INSTALL/lib/udev/rules.d
 
 mkdir -p $INSTALL/etc/dbus-1/system.d
   cp $PKG_BUILD/hal.conf $INSTALL/etc/dbus-1/system.d
@@ -62,7 +64,6 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor
 cp \
   $PKG_BUILD/fdi/policy/10osvendor/10-input-policy.fdi \
   $PKG_BUILD/fdi/policy/10osvendor/10-keymap.fdi \
-  $PKG_BUILD/fdi/policy/10osvendor/10-usbcsr-mice.fdi \
-  $PKG_BUILD/fdi/policy/10osvendor/20-acl-management.fdi \
   $PKG_BUILD/fdi/policy/10osvendor/20-storage-methods.fdi \
+  $PKG_BUILD/fdi/policy/10osvendor/20-acl-management.fdi \
   $INSTALL/usr/share/hal/fdi/policy/10osvendor