diff --git a/sendmail-8.13.7-pid.patch b/sendmail-8.13.7-pid.patch
index 0025923..4e22c85 100644
--- a/sendmail-8.13.7-pid.patch
+++ b/sendmail-8.13.7-pid.patch
@@ -12,7 +12,7 @@
  define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
  define(`confTIME_ZONE', `USE_TZ')dnl
  define(`confDONT_INIT_GROUPS', `True')dnl
-+define(`confPID_FILE', `/var/run/sm-client.pid')dnl
++define(`confPID_FILE', `/run/sm-client.pid')dnl
 +dnl define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl
 +FEATURE(`use_ct_file')dnl
  dnl
diff --git a/sendmail-8.14.5-qos.patch b/sendmail-8.14.5-qos.patch
index 0d8e856..a758b0f 100644
--- a/sendmail-8.14.5-qos.patch
+++ b/sendmail-8.14.5-qos.patch
@@ -18,7 +18,7 @@
  define(`confDONT_INIT_GROUPS', `True')dnl
 +dnl # If you're operating in a DSCP/RFC-4594 environment with QoS
 +dnl define(`confINET_QOS', `AF11')dnl
- define(`confPID_FILE', `/var/run/sm-client.pid')dnl
+ define(`confPID_FILE', `/run/sm-client.pid')dnl
  dnl define(`confDIRECT_SUBMISSION_MODIFIERS',`C')dnl
  FEATURE(`use_ct_file')dnl
 --- sendmail-8.14.4/sendmail/sendmail.h.orig	2009-12-18 10:08:01.000000000 -0700
diff --git a/sendmail.service b/sendmail.service
index acbd2c0..d8ef02b 100644
--- a/sendmail.service
+++ b/sendmail.service
@@ -1,16 +1,18 @@
 [Unit]
-Description=Sendmail Mail Transport Agent.
+Description=Sendmail Mail Transport Agent
 After=syslog.target network.target
 Conflicts=postfix.service exim.service
+Wants=sm-client.service
 
 [Service]
+Type=forking
+PIDFile=/run/sendmail.pid
 EnvironmentFile=-/etc/sysconfig/sendmail
 ExecStartPre=-/etc/mail/make
 ExecStartPre=-/etc/mail/make aliases
 ExecStart=/usr/sbin/sendmail $DAEMON $QUEUE $SENDMAIL_OPTARG
 ExecReload=-/etc/mail/make
 ExecReload=-/etc/mail/make aliases
-RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sendmail.spec b/sendmail.spec
index 45b358b..9a2e121 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -14,7 +14,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -673,6 +673,15 @@ exit 0
 
 
 %changelog
+* Mon Jul 18 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.5-4
+- Removed dots from description (there are no dots in systemd packaging
+  guidelines)
+- Changed service type to forking and explicitly specified PID files
+- Fixed creation of sm-client.pid
+- Added Wants to sm-client.service and sendmail.service
+- Replaced each occurrence of /var/run by /run in config files
+- More details are available in rhbz#697636
+
 * Thu Jun 30 2011 Jóhann B. Guðmundsson <johannbg@gmail.com> - 8.14.5-3
 - Introduce systemd unit file, drop SysV support
 
diff --git a/sm-client.service b/sm-client.service
index 17cd64a..dbd4465 100644
--- a/sm-client.service
+++ b/sm-client.service
@@ -1,11 +1,16 @@
 [Unit]
-Description=Sendmail Mail Transport Client.
+Description=Sendmail Mail Transport Client
 After=syslog.target network.target sendmail.service
+Wants=sendmail.service
 
 [Service]
+Type=forking
+PIDFile=/run/sm-client.pid
 EnvironmentFile=-/etc/sysconfig/sendmail
+ExecStartPre=/bin/touch /run/sm-client.pid
+ExecStartPre=/bin/chown smmsp:smmsp /run/sm-client.pid
+ExecStartPre=-/sbin/restorecon /run/sm-client.pid
 ExecStart=/usr/sbin/sendmail -L sm-msp-queue -Ac $QUEUE $SENDMAIL_OPTARG
-RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target