diff --git a/src/etc/rc.d/amd b/src/etc/rc.d/amd
index b6b82230..f31c7833 100644
--- a/src/etc/rc.d/amd
+++ b/src/etc/rc.d/amd
@@ -1,11 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: amd,v 1.6 2013/09/01 15:02:35 ajacoutot Exp $
+# $OpenBSD: amd,v 1.7 2015/07/15 13:50:54 ajacoutot Exp $
 
 daemon="/usr/sbin/amd"
 
 . /etc/rc.d/rc.subr
 
+pexp="${daemon}.*"
 rc_reload=NO
 rc_stop=NO
 
diff --git a/src/etc/rc.d/spamd b/src/etc/rc.d/spamd
index cbdb4cc0..87003ce8 100644
--- a/src/etc/rc.d/spamd
+++ b/src/etc/rc.d/spamd
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: spamd,v 1.6 2014/07/20 08:37:07 rpe Exp $
+# $OpenBSD: spamd,v 1.7 2015/07/15 13:50:54 ajacoutot Exp $
 
 daemon="/usr/libexec/spamd"
 
 . /etc/rc.d/rc.subr
 
-pexp="spamd: \[priv\]"
+pexp="spamd: \[priv\].*"
 rc_reload=NO
 
 rc_pre() {
diff --git a/src/etc/rc.d/sshd b/src/etc/rc.d/sshd
index dc3d58d5..8ea6f579 100644
--- a/src/etc/rc.d/sshd
+++ b/src/etc/rc.d/sshd
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $OpenBSD: sshd,v 1.2 2013/02/05 00:26:31 halex Exp $
+# $OpenBSD: sshd,v 1.3 2015/07/15 13:50:54 ajacoutot Exp $
 
 daemon="/usr/sbin/sshd"
 
 . /etc/rc.d/rc.subr
 
 rc_reload() {
-	${daemon} ${daemon_flags} -t && pkill -HUP -f "^${pexp}"
+	${daemon} ${daemon_flags} -t && pkill -HUP -xf "${pexp}"
 }
 
 rc_cmd $1
diff --git a/src/etc/rc.d/tftpproxy b/src/etc/rc.d/tftpproxy
index ad661474..0b94ff56 100644
--- a/src/etc/rc.d/tftpproxy
+++ b/src/etc/rc.d/tftpproxy
@@ -1,11 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: tftpproxy,v 1.1 2012/08/20 12:37:53 dlg Exp $
+# $OpenBSD: tftpproxy,v 1.2 2015/07/15 13:50:54 ajacoutot Exp $
 
 daemon="/usr/sbin/tftp-proxy"
 
 . /etc/rc.d/rc.subr
 
+pexp="tftp-proxy: privproc"
 rc_reload=NO
 
 rc_cmd $1
diff --git a/src/etc/rc.d/ypldap b/src/etc/rc.d/ypldap
index 98a51d62..3dad9d10 100644
--- a/src/etc/rc.d/ypldap
+++ b/src/etc/rc.d/ypldap
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $OpenBSD: ypldap,v 1.2 2011/10/13 07:54:06 ajacoutot Exp $
+# $OpenBSD: ypldap,v 1.3 2015/07/15 13:50:54 ajacoutot Exp $
 
 daemon="/usr/sbin/ypldap"
 
 . /etc/rc.d/rc.subr
 
-pexp="ypldap: ldap client"
+pexp="ypldap: ldap client.*"
 
 rc_cmd $1