diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile
index ac7db6cafd2c..1037c5a06036 100644
--- a/etc/pam.d/Makefile
+++ b/etc/pam.d/Makefile
@@ -4,6 +4,8 @@
 
 NO_OBJ=
 
+FILESGROUPS=	FILES
+
 FILES=	README \
 	cron \
 	ftpd \
@@ -17,7 +19,11 @@ FILES=	README \
 	xdm
 
 .if ${MK_AT} != "no"
-FILES+=	atrun
+FILESGROUPS=	AT
+AT+=	atrun
+ATPACKAGE+=	at
+ATDIR=	/etc/pam.d
+ATMODE=	644
 .endif
 
 FILESDIR=	/etc/pam.d
diff --git a/release/packages/at/+MANIFEST b/release/packages/at/+MANIFEST
new file mode 100644
index 000000000000..47beff96ab7c
--- /dev/null
+++ b/release/packages/at/+MANIFEST
@@ -0,0 +1,13 @@
+name = "FreeBSD-at"
+origin = "base"
+version = "%VERSION%"
+comment = "at(1) and related utilities"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+TODO
+EOD
diff --git a/usr.bin/at/Makefile.inc b/usr.bin/at/Makefile.inc
index ec44e1f6a5a5..f6952a9f5fb4 100644
--- a/usr.bin/at/Makefile.inc
+++ b/usr.bin/at/Makefile.inc
@@ -9,6 +9,7 @@ DAEMON_UID=1
 DEFAULT_BATCH_QUEUE=E
 DEFAULT_AT_QUEUE=c
 PERM_PATH=/var/at
+PACKAGE=	at
 
 CFLAGS += -DATJOB_DIR=\"$(ATJOB_DIR)/\" \
 	-DLFILE=\"$(ATJOB_DIR)/$(LOCKFILE)\" \