diff --git a/etc/Makefile b/etc/Makefile
index 68b3c15d1c3c..d48538d9e10f 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -174,7 +174,6 @@ distribution:
 .if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif
-	${_+_}cd ${.CURDIR}/cron.d; ${MAKE} install
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
diff --git a/etc/cron.d/Makefile b/etc/cron.d/Makefile
deleted file mode 100644
index 3ddc5fb438ac..000000000000
--- a/etc/cron.d/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-.if ${MK_AT} != "no"
-FILES+=		at
-.endif
-
-BINDIR=		/etc/cron.d
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index 5e9cfc9302fd..7dde46f28e67 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -2,6 +2,9 @@
 
 .include "${.CURDIR}/Makefile.inc"
 
+CONFS=	atrun
+CONFSDIR=	/etc/cron.d
+CONFSNAME=	at
 PROG=	at
 SRCS=	at.c panic.c parsetime.c perm.c
 LINKS=	${BINDIR}/at ${BINDIR}/atq \
diff --git a/etc/cron.d/at b/usr.bin/at/atrun
similarity index 100%
rename from etc/cron.d/at
rename to usr.bin/at/atrun