diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c
index c87d6c01510f..521d993e6554 100644
--- a/usr.sbin/autofs/automount.c
+++ b/usr.sbin/autofs/automount.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2014 The FreeBSD Foundation
  * All rights reserved.
  *
diff --git a/usr.sbin/autofs/automountd.c b/usr.sbin/autofs/automountd.c
index 2983eead99e3..ffc247274c1e 100644
--- a/usr.sbin/autofs/automountd.c
+++ b/usr.sbin/autofs/automountd.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2014 The FreeBSD Foundation
  * All rights reserved.
  *
diff --git a/usr.sbin/autofs/autounmountd.c b/usr.sbin/autofs/autounmountd.c
index f65e78a81067..539bde5e6e77 100644
--- a/usr.sbin/autofs/autounmountd.c
+++ b/usr.sbin/autofs/autounmountd.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2014 The FreeBSD Foundation
  * All rights reserved.
  *
diff --git a/usr.sbin/autofs/common.c b/usr.sbin/autofs/common.c
index 42b64f84bdda..65b8737bcff4 100644
--- a/usr.sbin/autofs/common.c
+++ b/usr.sbin/autofs/common.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2014 The FreeBSD Foundation
  * All rights reserved.
  *
diff --git a/usr.sbin/autofs/common.h b/usr.sbin/autofs/common.h
index dc84415aff87..273bc39431b3 100644
--- a/usr.sbin/autofs/common.h
+++ b/usr.sbin/autofs/common.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2014 The FreeBSD Foundation
  * All rights reserved.
  *
diff --git a/usr.sbin/autofs/defined.c b/usr.sbin/autofs/defined.c
index 9bb285f3c29f..f8145137acb0 100644
--- a/usr.sbin/autofs/defined.c
+++ b/usr.sbin/autofs/defined.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2014 The FreeBSD Foundation
  * All rights reserved.
  *
diff --git a/usr.sbin/autofs/log.c b/usr.sbin/autofs/log.c
index b3935dc0ed01..b21eb2d0359d 100644
--- a/usr.sbin/autofs/log.c
+++ b/usr.sbin/autofs/log.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2012 The FreeBSD Foundation
  * All rights reserved.
  *
diff --git a/usr.sbin/autofs/popen.c b/usr.sbin/autofs/popen.c
index e75c9f4c2253..f1be8ec9a4ca 100644
--- a/usr.sbin/autofs/popen.c
+++ b/usr.sbin/autofs/popen.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 2014 The FreeBSD Foundation
diff --git a/usr.sbin/autofs/token.l b/usr.sbin/autofs/token.l
index 6a92b7f13b8f..c1d96d2ae48a 100644
--- a/usr.sbin/autofs/token.l
+++ b/usr.sbin/autofs/token.l
@@ -1,5 +1,7 @@
 %{
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2014 The FreeBSD Foundation
  * All rights reserved.
  *