diff --git a/src/etc/Makefile b/src/etc/Makefile
index bad3bc1d..7eee8e26 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.233 2006/05/09 21:17:13 miod Exp $
+#	$OpenBSD: Makefile,v 1.234 2006/06/01 16:43:23 norby Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -78,6 +78,7 @@ distribution-etc-root-var: distrib-dirs
 	pwd_mkdb -p -d ${DESTDIR}/etc /etc/master.passwd
 	${INSTALL} -c -o root -g wheel -m 600 bgpd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 ospfd.conf ${DESTDIR}/etc
+	${INSTALL} -c -o root -g wheel -m 600 dvmrpd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 pf.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 hostapd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 ipsec.conf ${DESTDIR}/etc
@@ -379,7 +380,7 @@ distrib:
 DHSIZE=1024 1536 2048 3072 4096
 update-moduli:
 	( \
-		echo '#    $$OpenBSD: Makefile,v 1.233 2006/05/09 21:17:13 miod Exp $$'; \
+		echo '#    $$OpenBSD: Makefile,v 1.234 2006/06/01 16:43:23 norby Exp $$'; \
 		echo '# Time Type Tests Tries Size Generator Modulus'; \
 		( for i in ${DHSIZE}; do \
 			ssh-keygen -b $$i -G /dev/stdout; \
diff --git a/src/etc/changelist b/src/etc/changelist
index be7365cb..83058a7c 100644
--- a/src/etc/changelist
+++ b/src/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.44 2005/12/28 04:57:28 david Exp $
+#	$OpenBSD: changelist,v 1.45 2006/06/01 16:43:23 norby Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -27,6 +27,7 @@
 /etc/dhcpd.interfaces
 /etc/disktab
 /etc/distfile
+/etc/dvmrpd.conf
 /etc/ethers
 /etc/exports
 /etc/fbtab
diff --git a/src/etc/ftpusers b/src/etc/ftpusers
index 3f9041c3..910ff1ec 100644
--- a/src/etc/ftpusers
+++ b/src/etc/ftpusers
@@ -1,4 +1,4 @@
-#	$OpenBSD: ftpusers,v 1.27 2005/04/13 21:37:05 henning Exp $
+#	$OpenBSD: ftpusers,v 1.28 2006/06/01 16:43:23 norby Exp $
 #
 # list of users disallowed any ftp access.
 # read by ftpd(8).
@@ -38,3 +38,4 @@ _ntp
 _ftp
 _ospfd
 _hostapd
+_dvmrpd
diff --git a/src/etc/group b/src/etc/group
index ac516e05..00ea05f4 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -51,6 +51,7 @@ _ntp:*:83:
 _ftp:*:84:
 _ospfd:*:85:
 _hostapd:*:86:
+_dvmrpd:*:87:
 dialer:*:117:
 nogroup:*:32766:
 nobody:*:32767:
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index d89dc11e..8c39efa6 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.18 2005/04/13 21:37:06 henning Exp $
+#	$OpenBSD: aliases,v 1.19 2006/06/01 16:43:23 norby Exp $
 #
 #  Aliases in this file will NOT be expanded in the header from
 #  Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
@@ -24,6 +24,7 @@ www:	root
 _afs: /dev/null
 _bgpd: /dev/null
 _dhcp: /dev/null
+_dvmrpd: /dev/null
 _fingerd: /dev/null
 _ftp: /dev/null
 _hostapd: /dev/null
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 11c8eee8..7a93ad6f 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -33,4 +33,5 @@ _ntp:*:83:83::0:0:NTP Daemon:/var/empty:/sbin/nologin
 _ftp:*:84:84::0:0:FTP Daemon:/var/empty:/sbin/nologin
 _ospfd:*:85:85::0:0:OSPF Daemon:/var/empty:/sbin/nologin
 _hostapd:*:86:86::0:0:HostAP Daemon:/var/empty:/sbin/nologin
+_dvmrpd:*:87:87::0:0:DVMRP Daemon:/var/empty:/sbin/nologin
 nobody:*:32767:32767::0:0:Unprivileged user:/nonexistent:/sbin/nologin
diff --git a/src/etc/mtree/special b/src/etc/mtree/special
index 57fce45e..9cfbaf40 100644
--- a/src/etc/mtree/special
+++ b/src/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.68 2006/01/04 04:21:52 david Exp $
+#	$OpenBSD: special,v 1.69 2006/06/01 16:43:23 norby Exp $
 #	$NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
@@ -24,6 +24,7 @@ csh.logout	type=file mode=0644 uname=root gname=wheel
 daily		type=file mode=0644 uname=root gname=wheel
 daily.local	type=file mode=0644 uname=root gname=wheel optional
 disklabels	type=dir mode=0755 uname=root gname=wheel ignore
+dvmrpd.conf	type=file mode=0600 uname=root gname=wheel
 ..	#disklabels
 exports		type=file mode=0644 uname=root gname=wheel optional
 fbtab		type=file mode=0644 uname=root gname=wheel
diff --git a/src/etc/rc b/src/etc/rc
index c1320f37..ac81a99b 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.283 2006/05/29 16:49:42 avsm Exp $
+#	$OpenBSD: rc,v 1.284 2006/06/01 16:43:23 norby Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -571,6 +571,10 @@ if [ X"${mrouted_flags}" != X"NO" ]; then
 	echo -n ' mrouted';		mrouted $mrouted_flags
 fi
 
+if [ X"${dvmrpd_flags}" != X"NO" ]; then
+	echo -n ' dvmrpd';		/usr/sbin/dvmrpd $dvmrpd_flags
+fi
+
 if [ X"${ospfd_flags}" != X"NO" ]; then
 	echo -n ' ospfd';		/usr/sbin/ospfd $ospfd_flags
 fi
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 83316c83..173683c4 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,11 +1,12 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.113 2006/05/29 16:49:42 avsm Exp $
+#	$OpenBSD: rc.conf,v 1.114 2006/06/01 16:43:23 norby Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
 mrouted_flags=NO	# for normal use: "", if activated
 			# be sure to enable multicast_router below.
+dvmrpd_flags=NO		# for normal use: ""
 ospfd_flags=NO		# for normal use: ""
 bgpd_flags=NO		# for normal use: ""
 rarpd_flags=NO		# for normal use: "-a"