diff --git a/src/etc/rc.d/spamd b/src/etc/rc.d/spamd
index e8183f58..cbdb4cc0 100644
--- a/src/etc/rc.d/spamd
+++ b/src/etc/rc.d/spamd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: spamd,v 1.5 2014/07/17 15:00:06 ajacoutot Exp $
+# $OpenBSD: spamd,v 1.6 2014/07/20 08:37:07 rpe Exp $
 
 daemon="/usr/libexec/spamd"
 
@@ -16,11 +16,11 @@ rc_pre() {
 }
 
 rc_start() {
-	${rcexec} "${daemon} ${daemon_flags} ${_bg}"
+	${rcexec} "${daemon} ${daemon_flags}" || return 1
 	spamd_setup_flags="-D"
 	[ X"${spamd_black}" != X"NO" ] && \
 		spamd_setup_flags="-b ${spamd_setup_flags}"
-	_rc_do _rc_wait start && /usr/libexec/spamd-setup ${spamd_setup_flags}
+	/usr/libexec/spamd-setup ${spamd_setup_flags}
 }
 
 rc_cmd $1