diff --git a/acpid.spec b/acpid.spec
index 9759e6a..5f316e9 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -102,8 +102,8 @@ if [ "$1" = "0" ]; then
 	/sbin/service acpid stop >/dev/null 2>&1
 	/sbin/chkconfig --del acpid
 
-	/bin/systemctl disable %{name}.service %{name}.socket > /dev/null 2>&1 || :
-	/bin/systemctl stop %{name}.service %{name}.socket > /dev/null 2>&1 || :
+	/bin/systemctl disable %{name}.service > /dev/null 2>&1 || :
+	/bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
 
 fi
 
@@ -115,6 +115,11 @@ if [ "$1" -ge "1" ]; then
 	/bin/systemctl try-restart %{name}.service > /dev/null 2>&1 || :
 fi
 
+%triggerun -- acpid < 2.0.9
+if /sbin/chkconfig --level 3 acpid ; then
+	/bin/systemctl enable acpid.service >/dev/null 2>&1 || :
+fi
+
 %changelog
 * Tue May 03 2011 Jiri Skala <jskala@redhat.com> - 2.0.9-3
 - corrected relase number to be min equal to f15