diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index af671daad0c..a909dff75e3 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -26,10 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
 
 #define _USE_BSD 1
 
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index 302ae58f134..61584426ca9 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -23,10 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
 
 /* System Headers */
 
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index dc0d180a67a..4d738d0c640 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -33,10 +33,9 @@
  *                                   \PLUS NUMBER MINUTES|HOURS|DAYS|WEEKS/
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
 
 /* System Headers */
 
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 1e9ec9cb292..b22b3abbb3b 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -23,10 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
 
 /* System Headers */