diff --git a/src/etc/netstart b/src/etc/netstart
index 10e98720..9d335c74 100644
--- a/src/etc/netstart
+++ b/src/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: netstart,v 1.18 1997/04/15 09:42:33 deraadt Exp $
+#	$OpenBSD: netstart,v 1.19 1997/06/17 10:20:06 niklas Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=-q
@@ -28,6 +28,7 @@ lpd=NO				# printing daemons
 # miscellaneous other flags
 # only used if the appropriate server is marked YES above
 gated_flags=
+yppasswdd_flags=		# "-d /etc/yp" if passwd files is in /etc/yp
 amd_dir=/amd			# AMD's mount directory
 amd_master=/etc/amd/master	# AMD 'master' map
 ipfilter_rules=/etc/ipf.rules	# Rules for IP packet filtering
diff --git a/src/etc/rc b/src/etc/rc
index 349a7b8c..88683799 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.34 1997/04/22 23:04:57 deraadt Exp $
+#	$OpenBSD: rc,v 1.35 1997/06/17 10:20:05 niklas Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -137,7 +137,8 @@ if [ -d /var/yp/binding ]; then
 			    sed -e 's/^Name:    //'`
 		fi
 		if [ "$_host2" = "$_host1" ]; then
-			echo -n ' rpc.yppasswdd'; rpc.yppasswdd
+			echo -n ' rpc.yppasswdd'
+			rpc.yppasswdd ${yppasswdd_flags}
 		fi
 	fi
 fi