diff --git a/src/etc/rc b/src/etc/rc
index d11b8638..5b2667b2 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.465 2015/10/03 18:57:11 renato Exp $
+#	$OpenBSD: rc,v 1.466 2015/10/18 03:51:11 deraadt Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -363,6 +363,7 @@ fi
 
 echo -n 'starting RPC daemons:'
 start_daemon portmap ypldap
+rm -f /var/run/ypbind.lock
 if [[ -n $(domainname) ]]; then
 	start_daemon ypserv ypbind yppasswdd
 fi
diff --git a/src/etc/rc.d/ypbind b/src/etc/rc.d/ypbind
index 167efcd6..32bc81ba 100644
--- a/src/etc/rc.d/ypbind
+++ b/src/etc/rc.d/ypbind
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: ypbind,v 1.4 2011/10/07 05:54:48 ajacoutot Exp $
+# $OpenBSD: ypbind,v 1.5 2015/10/18 03:51:11 deraadt Exp $
 
 daemon="/usr/sbin/ypbind"
 
@@ -13,4 +13,8 @@ rc_pre() {
 	[ X"`domainname`" != X"" ]
 }
 
+rc_post() {
+	rm -f /var/run/ypbind.lock
+}
+
 rc_cmd $1