diff --git a/src/etc/rc.d/rc.subr b/src/etc/rc.d/rc.subr
index b25f75c6..e205fd6c 100644
--- a/src/etc/rc.d/rc.subr
+++ b/src/etc/rc.d/rc.subr
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.subr,v 1.102 2015/12/19 11:19:17 ajacoutot Exp $
+#	$OpenBSD: rc.subr,v 1.103 2015/12/19 14:10:41 ajacoutot Exp $
 #
 # Copyright (c) 2010, 2011, 2014 Antoine Jacoutot <ajacoutot@openbsd.org>
 # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -202,13 +202,8 @@ rc_cmd() {
 			if type rc_pre >/dev/null; then
 				_rc_do rc_pre || break
 			fi
-			# XXX only checks the status of the return code,
-			# and _not_ that the daemon is actually running
 			_rc_do rc_start || break
-			if [ -n "${_bg}" ]; then
-				sleep 1
-				_rc_do _rc_wait start || break
-			fi
+			_rc_do _rc_wait start || break
 			_rc_do _rc_write_runfile
 			_rc_exit ok
 		done