diff --git a/src/etc/Makefile b/src/etc/Makefile
index 0fef39f3..1cc86761 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.176 2003/02/06 16:34:51 henning Exp $
+#	$OpenBSD: Makefile,v 1.177 2003/02/19 22:11:42 millert Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	US/Pacific
@@ -192,7 +192,9 @@ distribution-etc-root-var: distrib-dirs
 	${INSTALL} -c -o ${BINOWN} -g operator -m 664 /dev/null \
 		${DESTDIR}/etc/dumpdates
 	${INSTALL} -c -o root -g crontab -m 660 /dev/null \
-		${DESTDIR}/var/at/at.deny
+		${DESTDIR}/var/cron/at.deny
+	${INSTALL} -c -o root -g crontab -m 660 /dev/null \
+		${DESTDIR}/var/cron/cron.deny
 	${INSTALL} -c -o root -g wheel -m 600 /dev/null \
 		${DESTDIR}/var/cron/log
 	${INSTALL} -c -o root -g wheel -m 444 /dev/null \
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index f6b0f9d2..dc5ff5b3 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.143 2003/02/04 01:35:08 deraadt Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.144 2003/02/19 22:11:42 millert Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -1792,17 +1792,6 @@ dev		mode=0555
 # ./var/empty
 ..
 
-# ./var/at
-at		gname=daemon
-
-# ./var/at/jobs
-jobs		gname=crontab mode=01770
-# ./var/at/jobs
-..
-
-# ./var/at
-..
-
 # ./var/backups
 backups		mode=0700
 # ./var/backups
@@ -1821,8 +1810,15 @@ crash		mode=770
 # ./var/cron
 cron		mode=0555
 
+# ./var/cron/atjobs
+atjobs		gname=crontab mode=01770
+
 # ./var/cron/tabs
-tabs		gname=crontab mode=1730
+..
+
+# ./var/cron/tabs
+tabs		gname=crontab mode=01730
+
 # ./var/cron/tabs
 ..
 
diff --git a/src/etc/mtree/special b/src/etc/mtree/special
index a8391373..081fd73a 100644
--- a/src/etc/mtree/special
+++ b/src/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.50 2003/02/06 16:34:51 henning Exp $
+#	$OpenBSD: special,v 1.51 2003/02/19 22:11:42 millert Exp $
 #	$NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
@@ -134,15 +134,15 @@ var		type=dir mode=0755 uname=root gname=wheel
 account		type=dir mode=0755 uname=root gname=wheel
 acct		type=file mode=0644 uname=root gname=wheel optional
 ..	#var/account
-at		type=dir mode=0755 uname=root gname=daemon ignore
-..	#var/at
 yp		type=dir mode=0755 uname=root gname=wheel optional ignore
 ..	#var/yp
 backups		type=dir mode=0700 uname=root gname=wheel ignore
 ..	#var/backups
 cron		type=dir mode=0555 uname=root gname=wheel
 log		type=file mode=0600 uname=root gname=wheel
-tabs		type=dir mode=1730 uname=root gname=crontab ignore
+atjobs		type=dir mode=01770 uname=root gname=crontab ignore
+..	#var/cron/atjobs
+tabs		type=dir mode=01730 uname=root gname=crontab ignore
 ..	#var/cron/tabs
 ..	#var/cron
 db		type=dir mode=0755 uname=root gname=wheel