diff --git a/src/etc/rc b/src/etc/rc
index 602bdbcc..30ff4dc9 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.272 2005/09/19 15:47:45 fgsch Exp $
+#	$OpenBSD: rc,v 1.273 2005/09/22 23:57:31 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -336,14 +336,17 @@ if [ X"${portmap}" = X"YES" ]; then
 	echo -n ' portmap';		portmap
 fi
 
-if [ -d /var/yp/binding -a X`domainname` != X ]; then
+if [ X`domainname` != X ]; then
 	if [ -d /var/yp/`domainname` ]; then
-		# yp server capabilities needed...
+		# YP server capabilities needed...
 		echo -n ' ypserv';		ypserv ${ypserv_flags}
 		#echo -n ' ypxfrd';		ypxfrd
 	fi
 
-	echo -n ' ypbind';		ypbind
+	if [ -d /var/yp/binding ]; then
+		# YP client capabilities needed...
+		echo -n ' ypbind';		ypbind
+	fi
 
 	if [ X"${yppasswdd_flags}" != X"NO" -a -d /var/yp/`domainname` ]; then
 		# if we are the master server, run rpc.yppasswdd