diff --git a/packages/sysutils/acpid/config/power b/packages/sysutils/acpid/config/power
new file mode 100644
index 0000000000..8b015a175c
--- /dev/null
+++ b/packages/sysutils/acpid/config/power
@@ -0,0 +1,2 @@
+event=button/power.*
+action=/etc/acpi/actions/powerdown.sh
diff --git a/packages/sysutils/busybox/init.d/23_acpid b/packages/sysutils/acpid/init.d/23_acpid
similarity index 96%
rename from packages/sysutils/busybox/init.d/23_acpid
rename to packages/sysutils/acpid/init.d/23_acpid
index 612ba39a50..87142fb27d 100755
--- a/packages/sysutils/busybox/init.d/23_acpid
+++ b/packages/sysutils/acpid/init.d/23_acpid
@@ -29,7 +29,7 @@
 (
   progress "Starting ACPI daemon"
 
-  acpid /dev/input/event* 2>&1 > /dev/null
+  acpid -l -n 2>&1 > /dev/null
 
   if [ -f /proc/acpi/wakeup ]; then
     progress "enable WakeUp devices"
diff --git a/packages/sysutils/acpid/install b/packages/sysutils/acpid/install
index 6a89d11ef8..a1b4f6ff6a 100755
--- a/packages/sysutils/acpid/install
+++ b/packages/sysutils/acpid/install
@@ -5,6 +5,12 @@
 mkdir -p $INSTALL/usr/sbin
   cp $PKG_BUILD/acpid $INSTALL/usr/sbin
 
+mkdir -p $INSTALL/etc/acpi/events
+  cp $PKG_DIR/config/power $INSTALL/etc/acpi/events
+
+mkdir -p $INSTALL/etc/acpi/actions
+  cp $PKG_DIR/scripts/powerdown.sh $INSTALL/etc/acpi/actions
+
 if [ "$DEVTOOLS" = yes ]; then
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/acpi_listen $INSTALL/usr/bin
diff --git a/packages/sysutils/acpid/scripts/powerdown.sh b/packages/sysutils/acpid/scripts/powerdown.sh
new file mode 100755
index 0000000000..afff274354
--- /dev/null
+++ b/packages/sysutils/acpid/scripts/powerdown.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+################################################################################
+#      Copyright (C) 2009-2010 OpenELEC.tv
+#      http://www.openelec.tv
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+if [ "$(pidof xbmc.bin)" -a -f /usr/bin/xbmc-send ]; then
+  # shutdown via xbmc
+    xbmc-send --host=127.0.0.1 -a "Powerdown"
+else
+  # shudown normally
+    /bin/sync
+    /sbin/poweroff
+fi
+