diff --git a/src/etc/rc b/src/etc/rc
index 4dde3ac2..83dbca4d 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.231 2003/12/29 23:16:45 millert Exp $
+#	$OpenBSD: rc,v 1.232 2004/01/23 22:11:40 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -245,7 +245,7 @@ if [ -d /var/yp/binding -a X`domainname` != X ]; then
 
 	echo -n ' ypbind';		ypbind
 
-	if [ -d /var/yp/`domainname` ]; then
+	if [ X"${yppasswdd_flags}" != X"NO" -a -d /var/yp/`domainname` ]; then
 		# if we are the master server, run rpc.yppasswdd
 		_host1=`ypwhich -m passwd 2> /dev/null`
 		_host2=`hostname`
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 60607bd1..fab993fb 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.91 2003/11/18 16:37:34 henning Exp $
+#	$OpenBSD: rc.conf,v 1.92 2004/01/23 22:11:40 deraadt Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -71,7 +71,7 @@ multicast_router=NO	# A multicast routing daemon will be run, e.g. mrouted
 # only used if the appropriate server is marked YES above
 savecore_flags=			# "-z" to compress
 ypserv_flags=			# E.g. -1 for YP v1, -d for DNS etc
-yppasswdd_flags=		# "-d /etc/yp" if passwd files are in /etc/yp
+yppasswdd_flags=NO		# "-d /etc/yp" if passwd files are in /etc/yp
 nfsd_flags="-tun 4"		# Crank the 4 for a busy NFS fileserver
 amd_dir=/tmp_mnt		# AMD's mount directory
 amd_master=/etc/amd/master	# AMD 'master' map