diff --git a/src/etc/Makefile b/src/etc/Makefile
index 2a49f911..5971b999 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.413 2015/11/10 04:33:02 jsg Exp $
+#	$OpenBSD: Makefile,v 1.414 2015/11/27 03:53:28 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -59,7 +59,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd eigrpd ftpd \
 	pflogd portmap radiusd rarpd rbootd relayd ripd route6d \
 	rtadvd sasyncd sensorsd slowcgi smtpd sndiod snmpd spamd \
 	spamlogd sshd statd syslogd tftpd tftpproxy unbound \
-	watchdogd wsmoused xdm ypbind ypldap yppasswdd ypserv
+	watchdogd wsmoused xdm ypbind ypldap ypserv
 
 MISETS=	base${OSrev}.tgz comp${OSrev}.tgz man${OSrev}.tgz game${OSrev}.tgz
 
diff --git a/src/etc/rc b/src/etc/rc
index d6ba3237..535a41f1 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.469 2015/11/10 20:34:58 tim Exp $
+#	$OpenBSD: rc,v 1.470 2015/11/27 03:53:28 deraadt Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -365,7 +365,7 @@ echo -n 'starting RPC daemons:'
 start_daemon portmap ypldap
 rm -f /var/run/ypbind.lock
 if [[ -n $(domainname) ]]; then
-	start_daemon ypserv ypbind yppasswdd
+	start_daemon ypserv ypbind
 fi
 start_daemon mountd nfsd lockd statd amd
 echo '.'
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index b85ab43a..ed7a00bc 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.206 2015/10/03 18:57:11 renato Exp $
+#	$OpenBSD: rc.conf,v 1.207 2015/11/27 03:53:28 deraadt Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -82,7 +82,6 @@ portmap_flags=NO	# note: inetd(8) rpc services need portmap too
 statd_flags=NO
 ypbind_flags=NO
 ypldap_flags=NO
-yppasswdd_flags=NO	# "-d /etc/yp" if passwd files are in /etc/yp
 ypserv_flags=NO
 
 # set the following to "YES" to turn them on