diff --git a/srcpkgs/acpid/files/acpid/run b/srcpkgs/acpid/files/acpid/run
index 5baf800e57..2f1ecdb65c 100755
--- a/srcpkgs/acpid/files/acpid/run
+++ b/srcpkgs/acpid/files/acpid/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec acpid -f
+exec acpid -fl
diff --git a/srcpkgs/acpid/files/handler.sh b/srcpkgs/acpid/files/handler.sh
index 1b6ea41db0..066dda2a74 100644
--- a/srcpkgs/acpid/files/handler.sh
+++ b/srcpkgs/acpid/files/handler.sh
@@ -16,7 +16,7 @@ case "$1" in
         case "$2" in
             PBTN|PWRF)
 		    logger "PowerButton pressed: $2"
-		    shutdown -h -P now
+		    shutdown -P now
 		    ;;
             *)      logger "ACPI action undefined: $2" ;;
         esac
@@ -68,6 +68,7 @@ case "$1" in
 		open)  logger "LID opened" ;;
 		*) logger "ACPI action undefined (LID): $2";;
 	esac
+	;;
     *)
         logger "ACPI group/action undefined: $1 / $2"
         ;;
diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template
index b04c3bbc75..3019707c7d 100644
--- a/srcpkgs/acpid/template
+++ b/srcpkgs/acpid/template
@@ -1,7 +1,8 @@
 # Template file for 'acpid'
 pkgname=acpid
 version=2.0.23
-revision=3
+revision=4
+build_options="systemd"
 build_style=gnu-configure
 conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
 short_desc="The ACPI Daemon (acpid) With Netlink Support"
@@ -11,8 +12,6 @@ homepage="http://sourceforge.net/projects/acpid2/"
 distfiles="${SOURCEFORGE_SITE}/acpid2/acpid-$version.tar.xz"
 checksum=4396aaec13510c3a1faa941a15a4b5335b6ae4fbec8438b9249b88c3b66187ee
 
-build_options="systemd"
-
 post_install() {
 	if [ "$build_option_systemd" ]; then
 		vinstall ${FILESDIR}/acpid.service 644 usr/lib/systemd/system