diff --git a/src/etc/Makefile b/src/etc/Makefile
index 8577a662..654cf57b 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.425 2016/05/26 16:29:51 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.426 2016/08/09 21:24:31 halex Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -30,9 +30,8 @@ kernels: bootblocks ${ALL_KERNELS}
 # -rw-r--r--
 BINOWN= root
 BINGRP= wheel
-MUTABLE=changelist csh.cshrc csh.login csh.logout daily \
-	etc.${MACHINE}/disktab etc.${MACHINE}/login.conf ftpusers \
-	gettytab group ksh.kshrc locate.rc mailer.conf \
+MUTABLE=changelist daily etc.${MACHINE}/disktab etc.${MACHINE}/login.conf \
+	ftpusers gettytab group ksh.kshrc locate.rc mailer.conf \
 	moduli monthly netstart networks newsyslog.conf ntpd.conf \
 	pf.os protocols rc rc.conf rpc services shells syslog.conf weekly
 
diff --git a/src/etc/csh.cshrc b/src/etc/csh.cshrc
deleted file mode 100644
index b6ef8d8e..00000000
--- a/src/etc/csh.cshrc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: csh.cshrc,v 1.2 1996/05/26 10:25:19 deraadt Exp $
-#
-# System-wide .cshrc file for csh(1).
diff --git a/src/etc/csh.login b/src/etc/csh.login
deleted file mode 100644
index 313148b3..00000000
--- a/src/etc/csh.login
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: csh.login,v 1.2 1996/05/26 10:25:19 deraadt Exp $
-#
-# System-wide .login file for csh(1).
diff --git a/src/etc/csh.logout b/src/etc/csh.logout
deleted file mode 100644
index 77b84db9..00000000
--- a/src/etc/csh.logout
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: csh.logout,v 1.2 1996/05/26 10:25:20 deraadt Exp $
-#
-# System-wide .logout file for csh(1).
diff --git a/src/etc/mtree/special b/src/etc/mtree/special
index 87c2a512..e50ca189 100644
--- a/src/etc/mtree/special
+++ b/src/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.119 2016/04/25 20:38:11 tedu Exp $
+#	$OpenBSD: special,v 1.120 2016/08/09 21:24:32 halex Exp $
 #
 # Hand-crafted mtree specification for the dangerous files.
 #
@@ -16,9 +16,9 @@ etc		type=dir mode=0755 uname=root gname=wheel
 bgpd.conf	type=file mode=0600 uname=root gname=wheel optional
 chio.conf	type=file mode=0644 uname=root gname=operator optional
 crontab		type=file mode=0600 uname=root gname=wheel optional
-csh.cshrc	type=file mode=0644 uname=root gname=wheel
-csh.login	type=file mode=0644 uname=root gname=wheel
-csh.logout	type=file mode=0644 uname=root gname=wheel
+csh.cshrc	type=file mode=0644 uname=root gname=wheel optional
+csh.login	type=file mode=0644 uname=root gname=wheel optional
+csh.logout	type=file mode=0644 uname=root gname=wheel optional
 daily		type=file mode=0644 uname=root gname=wheel
 daily.local	type=file mode=0644 uname=root gname=wheel optional
 dhcpd.conf	type=file mode=0644 uname=root gname=wheel optional