diff --git a/ipmievd.service b/ipmievd.service
index 82855c2..fc2a43d 100644
--- a/ipmievd.service
+++ b/ipmievd.service
@@ -5,6 +5,8 @@ After=syslog.target
 [Service]
 EnvironmentFile=-/etc/sysconfig/ipmievd
 ExecStart=/usr/sbin/ipmievd $IPMIEVD_OPTIONS
+Type=forking
+PIDFile=/var/run/ipmievd.pid0
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ipmitool.spec b/ipmitool.spec
index 59238df..737cbc6 100644
--- a/ipmitool.spec
+++ b/ipmitool.spec
@@ -1,7 +1,7 @@
 Name:         ipmitool
 Summary:      Utility for IPMI control
 Version:      1.8.11
-Release:      8%{?dist}
+Release:      9%{?dist}
 License:      BSD
 Group:        System Environment/Base
 URL:          http://ipmitool.sourceforge.net/
@@ -103,6 +103,9 @@ fi
 
 
 %changelog
+* Thu Apr 26 2012 Jan Safranek <jsafrane@redhat.com> - 1.8.11-9
+- fixed ipmievd.service systemd unit (#807757)
+
 * Tue Dec 13 2011 Jan Safranek <jsafrane@redhat.com> - 1.8.11-8
 - fixed CVE-2011-4339
 
diff --git a/openipmi-ipmievd.sysconf b/openipmi-ipmievd.sysconf
index cdc5913..8cc15e0 100644
--- a/openipmi-ipmievd.sysconf
+++ b/openipmi-ipmievd.sysconf
@@ -1 +1 @@
-IPMIEVD_OPTIONS="sel"
+IPMIEVD_OPTIONS="sel daemon pidfile=/var/run/ipmievd.pid"