diff --git a/src/etc/Makefile b/src/etc/Makefile
index 97222629..5f6552c1 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.290 2010/06/29 17:17:53 nicm Exp $
+#	$OpenBSD: Makefile,v 1.291 2010/09/22 13:01:10 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -232,8 +232,6 @@ distribution-etc-root-var: distrib-dirs
 	    ${DESTDIR}/var/log/wtmp
 	${INSTALL} -c -o ${BINOWN} -g wheel -m 640 /dev/null \
 	    ${DESTDIR}/var/log/xferlog
-	${INSTALL} -c -o daemon -g staff -m 664 /dev/null \
-	    ${DESTDIR}/var/msgs/bounds
 	${INSTALL} -c -o ${BINOWN} -g utmp -m 664 /dev/null \
 	    ${DESTDIR}/var/run/utmp
 .if ${MACHINE} == "vax"
diff --git a/src/etc/daily b/src/etc/daily
index 8504b154..cf010399 100644
--- a/src/etc/daily
+++ b/src/etc/daily
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: daily,v 1.67 2010/07/25 08:49:03 espie Exp $
+#	$OpenBSD: daily,v 1.68 2010/09/22 13:01:10 deraadt Exp $
 #	From: @(#)daily	8.2 (Berkeley) 1/25/94
 #
 # For local additions, create the file /etc/daily.local.
@@ -80,10 +80,6 @@ if [ -d /var/rwho -a ! -L /var/rwho ] ; then
 	find . ! -name . -mtime +7 -execdir rm -f -- {} \; ; }
 fi
 
-if [ -d /var/msgs -a ! -L /var/msgs ]; then
-	msgs -c
-fi
-
 next_part "Purging accounting records:"
 if [ -f /var/account/acct ]; then
 	mv -f /var/account/acct.2 /var/account/acct.3
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index e6f0f8be..fe41f48e 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.35 2010/06/03 20:32:36 reyk Exp $
+#	$OpenBSD: aliases,v 1.36 2010/09/22 13:01:10 deraadt 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.
@@ -84,6 +84,3 @@ security:	root
 # news:		usenet
 # webmaster:	root
 # ftp:		root
-
-# uncomment this for msgs:
-# msgs: "|/usr/bin/msgs -s"
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 88ffb7b5..14a7aa68 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.206 2010/06/07 14:15:27 jsg Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.207 2010/09/22 13:01:10 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -2460,11 +2460,6 @@ mail
 # ./var/mail
 ..
 
-# ./var/msgs
-msgs		uname=daemon
-# ./var/msgs
-..
-
 # ./var/named
 named
 
diff --git a/src/etc/mtree/4.4BSD.var b/src/etc/mtree/4.4BSD.var
index be83deba..9cc3fd24 100644
--- a/src/etc/mtree/4.4BSD.var
+++ b/src/etc/mtree/4.4BSD.var
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.var,v 1.12 2003/03/30 14:58:18 jmc Exp $
+#	$OpenBSD: 4.4BSD.var,v 1.13 2010/09/22 13:01:10 deraadt Exp $
 #	$NetBSD: 4.4BSD.var,v 1.3 1996/05/12 23:30:47 thorpej Exp $
 #
 #	   user: bostic
@@ -93,13 +93,6 @@ mail            type=dir uname=root gname=wheel mode=0755
 ..
 
 
-# ./msgs
-/set type=file gname=staff uname=daemon mode=0644
-msgs            type=dir mode=0775
-# ./msgs
-..
-
-
 # ./obj
 /set type=file gname=wsrc uname=root mode=0775
 obj             type=dir gname=wheel