diff --git a/acpid.changes b/acpid.changes
index d16eea1..3884594 100644
--- a/acpid.changes
+++ b/acpid.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Aug 19 18:18:51 UTC 2012 - crrodriguez@opensuse.org
+
+- Improve systemd unit
+ * run in the foreground
+ * use netlink only as /proc/acpi files are deprecated. 
+
 -------------------------------------------------------------------
 Mon Apr  2 23:59:08 UTC 2012 - tabraham@novell.com
 
diff --git a/acpid.service b/acpid.service
index 006c132..485c63b 100644
--- a/acpid.service
+++ b/acpid.service
@@ -2,16 +2,11 @@
 Description=ACPI Event Daemon
 After=syslog.target
 
-# This could probably benefit from socket activation, but honestly I think it
-# is time for acpid to go away, and hence I am not planning to spend the time
-# to add socket activation here. We use Type=forking to ensure that the
-# communication sockets are in place before boot proceeds with any service
-# needing this service. Would acpid support socket activation we could use
-# Type=simple here.
-
 [Service]
-Type=forking
-ExecStart=/usr/sbin/acpid 
+
+ExecStart=/usr/sbin/acpid -n -f
+ExecReload=/bin/kill -s HUP $MAINPID
+ExecStop=/bin/kill -s QUIT $MAINPID
 
 [Install]
 WantedBy=multi-user.target
diff --git a/acpid.spec b/acpid.spec
index e49ffeb..0515245 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -16,14 +16,13 @@
 #
 
 
-
 Name:           acpid
 Version:        2.0.16
 Release:        0
-License:        GPL-2.0+
 Summary:        Executes Actions at ACPI Events
-Url:            http://tedfelix.com/linux/acpid-netlink.html
+License:        GPL-2.0+
 Group:          System/Daemons
+Url:            http://tedfelix.com/linux/acpid-netlink.html
 Source:         http://tedfelix.com/linux/%{name}-%{version}.tar.gz
 Source2:        rcacpid
 Source3:        README.SuSE