diff --git a/acpid.changes b/acpid.changes
index 1f76495..4d1299e 100644
--- a/acpid.changes
+++ b/acpid.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 23 14:18:54 UTC 2011 - fcrozat@suse.com
+
+- Ensure acpid is enabled on initial install, under systemd
+
 -------------------------------------------------------------------
 Sat Sep 17 10:46:41 UTC 2011 - jengelh@medozas.de
 
diff --git a/acpid.spec b/acpid.spec
index a788ce5..4d94cca 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -83,6 +83,9 @@ touch %buildroot%_var/log/acpid
 %{fillup_and_insserv -y -f acpid}
 %service_migrate_to_systemd_post acpid
 %service_add acpid.service
+if [ $FIRST_ARG -eq 1 ]; then
+  /bin/systemctl enable acpid.service 2> /dev/null || :
+fi
 
 %postun
 %restart_on_update acpid