diff --git a/src/etc/Makefile b/src/etc/Makefile
index 752b8d95..54564a89 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.241 2006/10/10 12:45:58 todd Exp $
+#	$OpenBSD: Makefile,v 1.242 2006/10/29 18:58:57 norby Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -76,6 +76,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 ripd.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 chio.conf ${DESTDIR}/etc
@@ -337,7 +338,7 @@ distrib:
 DHSIZE=1024 1536 2048 3072 4096
 update-moduli:
 	( \
-		echo '#    $$OpenBSD: Makefile,v 1.241 2006/10/10 12:45:58 todd Exp $$'; \
+		echo '#    $$OpenBSD: Makefile,v 1.242 2006/10/29 18:58:57 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 2dafdac4..529d308d 100644
--- a/src/etc/changelist
+++ b/src/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.46 2006/09/19 19:33:04 aanriot Exp $
+#	$OpenBSD: changelist,v 1.47 2006/10/29 18:58:57 norby Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -103,6 +103,7 @@
 /etc/resolv.conf.tail
 +/etc/rndc.key
 /etc/rpc
+/etc/ripd.conf
 /etc/security
 /etc/sensorsd.conf
 /etc/services
diff --git a/src/etc/ftpusers b/src/etc/ftpusers
index 910ff1ec..c069a263 100644
--- a/src/etc/ftpusers
+++ b/src/etc/ftpusers
@@ -1,4 +1,4 @@
-#	$OpenBSD: ftpusers,v 1.28 2006/06/01 16:43:23 norby Exp $
+#	$OpenBSD: ftpusers,v 1.29 2006/10/29 18:58:57 norby Exp $
 #
 # list of users disallowed any ftp access.
 # read by ftpd(8).
@@ -39,3 +39,4 @@ _ftp
 _ospfd
 _hostapd
 _dvmrpd
+_ripd
diff --git a/src/etc/group b/src/etc/group
index 00ea05f4..7ff0d796 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -52,6 +52,7 @@ _ftp:*:84:
 _ospfd:*:85:
 _hostapd:*:86:
 _dvmrpd:*:87:
+_ripd:*:88:
 dialer:*:117:
 nogroup:*:32766:
 nobody:*:32767:
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index 8c39efa6..14bf547f 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.19 2006/06/01 16:43:23 norby Exp $
+#	$OpenBSD: aliases,v 1.20 2006/10/29 18:58:57 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.
@@ -39,6 +39,7 @@ _pflogd: /dev/null
 _portmap: /dev/null
 _ppp: /dev/null
 _rbootd: /dev/null
+_ripd: /dev/null
 _rstatd: /dev/null
 _rusersd: /dev/null
 _spamd: /dev/null
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 7a93ad6f..9baa7dbb 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -34,4 +34,5 @@ _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
+_ripd:*:88:88::0:0:RIP 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 1f86b286..efc77dac 100644
--- a/src/etc/mtree/special
+++ b/src/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.71 2006/09/19 19:33:04 aanriot Exp $
+#	$OpenBSD: special,v 1.72 2006/10/29 18:58:57 norby Exp $
 #	$NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
@@ -74,6 +74,7 @@ rc.securelevel	type=file mode=0644 uname=root gname=wheel
 rc.shutdown	type=file mode=0644 uname=root gname=wheel
 resolv.conf	type=file mode=0644 uname=root gname=wheel optional
 resolv.conf.tail type=file mode=0644 uname=root gname=wheel optional
+ripd.conf	type=file mode=0600 uname=root gname=wheel
 security	type=file mode=0644 uname=root gname=wheel
 sensorsd.conf	type=file mode=0644 uname=root gname=wheel
 shells		type=file mode=0644 uname=root gname=wheel
diff --git a/src/etc/rc b/src/etc/rc
index c55d0f6b..75f736ab 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.291 2006/09/27 19:54:36 mpf Exp $
+#	$OpenBSD: rc,v 1.292 2006/10/29 18:58:57 norby Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -558,6 +558,10 @@ if [ X"${routed_flags}" != X"NO" ]; then
 	echo -n ' routed';		routed $routed_flags
 fi
 
+if [ X"${ripd_flags}" != X"NO" ]; then
+	echo -n ' ripd';		/usr/sbin/ripd $ripd_flags
+fi
+
 if [ X"${mrouted_flags}" != X"NO" ]; then
 	echo -n ' mrouted';		mrouted $mrouted_flags
 fi
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index e4c589df..50573f80 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,9 +1,10 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.117 2006/09/27 19:54:36 mpf Exp $
+#	$OpenBSD: rc.conf,v 1.118 2006/10/29 18:58:57 norby Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
+ripd_flags=NO		# for normal use: ""
 mrouted_flags=NO	# for normal use: "", if activated
 			# be sure to enable multicast_router below.
 dvmrpd_flags=NO		# for normal use: ""