diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template
index 0a10faa5f94..aa674f86c7d 100644
--- a/srcpkgs/acpid/template
+++ b/srcpkgs/acpid/template
@@ -1,10 +1,9 @@
 # Template file for 'acpid'
 pkgname=acpid
 version=2.0.22
-revision=1
+revision=2
 build_style=gnu-configure
 conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
-systemd_services="acpid.socket on"
 short_desc="The ACPI Daemon (acpid) With Netlink Support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -12,9 +11,16 @@ homepage="http://sourceforge.net/projects/acpid2/"
 distfiles="${SOURCEFORGE_SITE}/acpid2/acpid-$version.tar.xz"
 checksum=3d11454f4283c8f771d8dbd5eb6b5f2bbd9d94d9f77d68bab89e35d98b67ab31
 
+build_options="systemd"
+if [ "$build_option_systemd" ]; then
+	systemd_services="acpid.socket on"
+fi
+
 post_install() {
-	vinstall ${FILESDIR}/acpid.service 644 usr/lib/systemd/system
-	vinstall ${FILESDIR}/acpid.socket 644 usr/lib/systemd/system
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/acpid.service 644 usr/lib/systemd/system
+		vinstall ${FILESDIR}/acpid.socket 644 usr/lib/systemd/system
+	fi
 	vinstall ${FILESDIR}/handler.sh 755 etc/acpi
 	vinstall ${FILESDIR}/anything 644 etc/acpi/events
 }