diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/acpid.map b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/acpid.map
index afefcd731..2994fe36e 100644
--- a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/acpid.map
+++ b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/acpid.map
@@ -1,2 +1,3 @@
-EV_KEY  0x01    KEY_POWER       116     1       pswitch-press
-EV_KEY  0x01    KEY_POWER       116     0       pswitch-release
+#s_type	n_type(hex)	s_code		n_code	value	description
+EV_KEY	0x01		KEY_SLEEP	142	1	pswitch-suspend
+EV_KEY	0x01		KEY_POWER	116	0	pswitch-poweroff
diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-poweroff b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-poweroff
new file mode 100644
index 000000000..45cca8b8e
--- /dev/null
+++ b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-poweroff
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+logger -t acpid  "Power key poweroff request."
+exec /sbin/poweroff
diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-press b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-press
deleted file mode 100644
index 4228dfcb7..000000000
--- a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-press
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ -f  /tmp/pswitch_press ]; then
-    logger -t acpid  "Bogus press event, removing."
-    rm -f /tmp/pswitch_press
-fi
-
-echo `date +%s` > /tmp/pswitch_press
-exit 0
diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-release b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-release
deleted file mode 100644
index b39823a19..000000000
--- a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-release
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-POWEROFF_DELAY=2
-
-if [ ! -f  /tmp/pswitch_press ]; then
-    logger -t acpid  "No press event."
-    exit 1
-fi
-
-while read line
-do
-    TSTAMP=$line
-done < /tmp/pswitch_press
-
-rm -f /tmp/pswitch_press
-
-TDIFF=$((`date +%s`- $TSTAMP))
-if [ $TDIFF -lt $POWEROFF_DELAY  ]; then
-    logger -t acpid  "Power key suspend request."
-    exec /bin/suspend
-else
-    logger -t acpid  "Power key poweroff request."
-    exec /sbin/poweroff
-fi
-
-exit 0
diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-suspend b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-suspend
new file mode 100644
index 000000000..f061ce276
--- /dev/null
+++ b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-suspend
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+logger -t acpid  "Power key suspend request."
+exec /bin/suspend
diff --git a/meta-digi-dey/recipes-core/busybox/busybox_1.23.2.bbappend b/meta-digi-dey/recipes-core/busybox/busybox_1.23.2.bbappend
index 6205e07b1..db220bd20 100644
--- a/meta-digi-dey/recipes-core/busybox/busybox_1.23.2.bbappend
+++ b/meta-digi-dey/recipes-core/busybox/busybox_1.23.2.bbappend
@@ -13,8 +13,8 @@ SRC_URI += "file://0001-del-baudrates.patch \
             file://digi-logo.png \
             file://busybox-acpid \
             file://acpid.map \
-            file://pswitch-press \
-            file://pswitch-release \
+            file://pswitch-suspend \
+            file://pswitch-poweroff \
             file://busybox-static-nodes \
             file://bridgeifupdown \
            "
@@ -32,8 +32,8 @@ INITSCRIPT_NAME_${PN}-ntpd = "busybox-ntpd"
 PACKAGES =+ "${PN}-acpid"
 FILES_${PN}-acpid = " ${sysconfdir}/init.d/busybox-acpid \
                        ${sysconfdir}/acpi/acpid.map \
-                       ${sysconfdir}/acpi/pswitch-press \
-                       ${sysconfdir}/acpi/pswitch-release \
+                       ${sysconfdir}/acpi/pswitch-suspend \
+                       ${sysconfdir}/acpi/pswitch-poweroff \
 "
 INITSCRIPT_PACKAGES =+ "${PN}-acpid"
 INITSCRIPT_NAME_${PN}-acpid = "busybox-acpid"
@@ -59,8 +59,8 @@ do_install_append() {
 		install -m 0755 ${WORKDIR}/busybox-acpid ${D}${sysconfdir}/init.d/
 		install -d ${D}${sysconfdir}/acpi/
 		install -m 0755 ${WORKDIR}/acpid.map ${D}${sysconfdir}/acpi/
-		install -m 0755 ${WORKDIR}/pswitch-press ${D}${sysconfdir}/acpi/
-		install -m 0755 ${WORKDIR}/pswitch-release ${D}${sysconfdir}/acpi/
+		install -m 0755 ${WORKDIR}/pswitch-suspend ${D}${sysconfdir}/acpi/
+		install -m 0755 ${WORKDIR}/pswitch-poweroff ${D}${sysconfdir}/acpi/
 	fi
 	if grep "CONFIG_MAKEDEVS=y" ${WORKDIR}/defconfig; then
 		install -m 0755 ${WORKDIR}/busybox-static-nodes ${D}${sysconfdir}/init.d/