diff --git a/sys-process/at/at-3.1.23.ebuild b/sys-process/at/at-3.1.23-r1.ebuild
similarity index 95%
rename from sys-process/at/at-3.1.23.ebuild
rename to sys-process/at/at-3.1.23-r1.ebuild
index 29858f5195ad2..c93aefcc3cecb 100644
--- a/sys-process/at/at-3.1.23.ebuild
+++ b/sys-process/at/at-3.1.23-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -64,7 +64,10 @@ src_install() {
 
 	newinitd "${FILESDIR}"/atd.rc8 atd
 	newconfd "${FILESDIR}"/atd.confd atd
-	newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
+
+	if use pam; then
+		newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
+	fi
 
 	# Preserve existing .SEQ files (bug #386625)
 	local seq_file="${EROOT}/var/spool/at/atjobs/.SEQ"
diff --git a/sys-process/at/at-3.2.1.ebuild b/sys-process/at/at-3.2.1-r1.ebuild
similarity index 95%
rename from sys-process/at/at-3.2.1.ebuild
rename to sys-process/at/at-3.2.1-r1.ebuild
index e24c9589dfec0..98907c6f7582a 100644
--- a/sys-process/at/at-3.2.1.ebuild
+++ b/sys-process/at/at-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -67,7 +67,10 @@ src_install() {
 
 	newinitd "${FILESDIR}"/atd.rc8 atd
 	newconfd "${FILESDIR}"/atd.confd atd
-	newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
+
+	if use pam; then
+		newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
+	fi
 
 	# Preserve existing .SEQ files (bug #386625)
 	local seq_file="${EROOT}/var/spool/at/atjobs/.SEQ"