diff --git a/src/etc/Makefile b/src/etc/Makefile
index ca072212..bb947d76 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.258 2008/01/03 21:20:24 jakob Exp $
+#	$OpenBSD: Makefile,v 1.259 2008/01/31 14:18:03 reyk Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -85,6 +85,7 @@ distribution-etc-root-var: distrib-dirs
 	${INSTALL} -c -o root -g wheel -m 600 relayd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 ipsec.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 sasyncd.conf ${DESTDIR}/etc
+	${INSTALL} -c -o root -g wheel -m 600 snmpd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	    etc.${MACHINE}/MAKEDEV ${DESTDIR}/dev
 	cd root; \
diff --git a/src/etc/changelist b/src/etc/changelist
index 6e6c8647..c7b8d3ca 100644
--- a/src/etc/changelist
+++ b/src/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.55 2007/12/07 17:13:35 deraadt Exp $
+#	$OpenBSD: changelist,v 1.56 2008/01/31 14:18:03 reyk Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -119,6 +119,7 @@
 /etc/shosts.equiv
 /etc/slip.hosts
 /etc/slip.login
+/etc/snmpd.conf
 /etc/ssh/ssh_config
 +/etc/ssh/ssh_host_dsa_key
 /etc/ssh/ssh_host_dsa_key.pub
diff --git a/src/etc/ftpusers b/src/etc/ftpusers
index 1117ecff..611c775e 100644
--- a/src/etc/ftpusers
+++ b/src/etc/ftpusers
@@ -1,4 +1,4 @@
-#	$OpenBSD: ftpusers,v 1.32 2007/12/07 17:13:35 deraadt Exp $
+#	$OpenBSD: ftpusers,v 1.33 2008/01/31 14:18:03 reyk Exp $
 #
 # list of users disallowed any ftp access.
 # read by ftpd(8).
@@ -42,3 +42,4 @@ _dvmrpd
 _ripd
 _relayd
 _ospf6d
+_snmpd
diff --git a/src/etc/group b/src/etc/group
index 619fc663..c00236e3 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -55,6 +55,7 @@ _dvmrpd:*:87:
 _ripd:*:88:
 _relayd:*:89:
 _ospf6d:*:90:
+_snmpd:*:91:
 dialer:*:117:
 nogroup:*:32766:
 nobody:*:32767:
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index 84944418..d69664cc 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.23 2007/12/09 20:06:55 reyk Exp $
+#	$OpenBSD: aliases,v 1.24 2008/01/31 14:18:03 reyk 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.
@@ -44,6 +44,7 @@ _relayd: /dev/null
 _ripd: /dev/null
 _rstatd: /dev/null
 _rusersd: /dev/null
+_snmpd: /dev/null
 _spamd: /dev/null
 _syslogd: /dev/null
 _tcpdump: /dev/null
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index e6b66671..ae3cb27d 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -37,4 +37,5 @@ _dvmrpd:*:87:87::0:0:DVMRP Daemon:/var/empty:/sbin/nologin
 _ripd:*:88:88::0:0:RIP Daemon:/var/empty:/sbin/nologin
 _relayd:*:89:89::0:0:Relay Daemon:/var/empty:/sbin/nologin
 _ospf6d:*:90:90::0:0:OSPF6 Daemon:/var/empty:/sbin/nologin
+_snmpd:*:91:91::0:0:SNMP 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 fdbb469d..eefa72f9 100644
--- a/src/etc/mtree/special
+++ b/src/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.78 2007/12/09 20:03:47 reyk Exp $
+#	$OpenBSD: special,v 1.79 2008/01/31 14:18:03 reyk Exp $
 #	$NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
@@ -84,6 +84,7 @@ sensorsd.conf	type=file mode=0644 uname=root gname=wheel
 shells		type=file mode=0644 uname=root gname=wheel
 skey		type=dir mode=01730 uname=root gname=auth optional
 ..	#skey
+snmpd.conf	type=file mode=0600 uname=root gname=wheel
 spwd.db		type=file mode=0640 uname=root gname=_shadow
 ssh		type=dir mode=0755 uname=root gname=wheel optional
 ssh_config	type=file mode=0644 uname=root gname=wheel
diff --git a/src/etc/rc b/src/etc/rc
index e4c092c9..f027bc96 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.310 2008/01/16 14:19:28 sthen Exp $
+#	$OpenBSD: rc,v 1.311 2008/01/31 14:18:03 reyk Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -562,6 +562,10 @@ fi
 
 echo -n starting network daemons:
 
+if [ X"${snmpd_flags}" != X"NO" ]; then
+	echo -n ' snmpd';		/usr/sbin/snmpd $snmpd_flags
+fi
+
 if [ X"${routed_flags}" != X"NO" ]; then
 	echo -n ' routed';		routed $routed_flags
 fi
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 2a2bf5a2..d7091318 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.127 2007/12/07 17:13:35 deraadt Exp $
+#	$OpenBSD: rc.conf,v 1.128 2008/01/31 14:18:03 reyk Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -41,6 +41,7 @@ ftpproxy_flags=NO	# for normal use: ""
 hostapd_flags=NO	# for normal use: ""
 ifstated_flags=NO	# for normal use: ""
 relayd_flags=NO		# for normal use: ""
+snmpd_flags=NO		# for normal use: ""
 
 # use -u to disable chroot, see httpd(8)
 httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))