From 378534f1ac889613f5ed596ba5a6afb9ab314aa3 Mon Sep 17 00:00:00 2001
From: eadler <eadler@FreeBSD.org>
Date: Wed, 14 Mar 2018 03:19:51 +0000
Subject: Partial merge of the SPDX changes

These changes are incomplete but are making it difficult
to determine what other changes can/should be merged.

No objections from:	pfg
---
 usr.bin/apply/apply.c                 | 2 ++
 usr.bin/ar/ar.c                       | 2 ++
 usr.bin/banner/banner.c               | 4 +++-
 usr.bin/basename/basename.c           | 2 ++
 usr.bin/biff/biff.c                   | 4 +++-
 usr.bin/calendar/calendar.c           | 2 ++
 usr.bin/calendar/calendar.h           | 2 ++
 usr.bin/calendar/day.c                | 2 ++
 usr.bin/calendar/io.c                 | 2 ++
 usr.bin/calendar/locale.c             | 2 ++
 usr.bin/calendar/pathnames.h          | 2 ++
 usr.bin/calendar/pom.c                | 4 +++-
 usr.bin/cap_mkdb/cap_mkdb.c           | 2 ++
 usr.bin/chpass/chpass.c               | 2 ++
 usr.bin/chpass/chpass.h               | 4 +++-
 usr.bin/chpass/edit.c                 | 2 ++
 usr.bin/chpass/field.c                | 4 +++-
 usr.bin/chpass/table.c                | 2 ++
 usr.bin/chpass/util.c                 | 2 ++
 usr.bin/cksum/cksum.c                 | 2 ++
 usr.bin/cksum/crc.c                   | 2 ++
 usr.bin/cksum/extern.h                | 2 ++
 usr.bin/cksum/print.c                 | 2 ++
 usr.bin/cksum/sum1.c                  | 2 ++
 usr.bin/cksum/sum2.c                  | 2 ++
 usr.bin/cmp/cmp.c                     | 2 ++
 usr.bin/cmp/extern.h                  | 2 ++
 usr.bin/cmp/misc.c                    | 2 ++
 usr.bin/cmp/regular.c                 | 2 ++
 usr.bin/cmp/special.c                 | 2 ++
 usr.bin/col/col.c                     | 2 ++
 usr.bin/colrm/colrm.c                 | 2 ++
 usr.bin/column/column.c               | 4 +++-
 usr.bin/comm/comm.c                   | 4 +++-
 usr.bin/compress/compress.c           | 2 ++
 usr.bin/compress/zopen.c              | 2 ++
 usr.bin/ctags/C.c                     | 4 +++-
 usr.bin/ctags/ctags.c                 | 4 +++-
 usr.bin/ctags/ctags.h                 | 4 +++-
 usr.bin/ctags/fortran.c               | 4 +++-
 usr.bin/ctags/lisp.c                  | 4 +++-
 usr.bin/ctags/print.c                 | 4 +++-
 usr.bin/ctags/tree.c                  | 4 +++-
 usr.bin/ctags/yacc.c                  | 4 +++-
 usr.bin/cut/cut.c                     | 2 ++
 usr.bin/dirname/dirname.c             | 2 ++
 usr.bin/du/du.c                       | 4 +++-
 usr.bin/env/env.c                     | 4 +++-
 usr.bin/expand/expand.c               | 4 +++-
 usr.bin/false/false.c                 | 4 +++-
 usr.bin/find/extern.h                 | 2 ++
 usr.bin/find/find.c                   | 2 ++
 usr.bin/find/find.h                   | 2 ++
 usr.bin/find/function.c               | 2 ++
 usr.bin/find/ls.c                     | 4 +++-
 usr.bin/find/main.c                   | 2 ++
 usr.bin/find/misc.c                   | 2 ++
 usr.bin/find/operator.c               | 2 ++
 usr.bin/find/option.c                 | 2 ++
 usr.bin/finger/extern.h               | 2 ++
 usr.bin/finger/finger.c               | 4 +++-
 usr.bin/finger/finger.h               | 4 +++-
 usr.bin/finger/lprint.c               | 4 +++-
 usr.bin/finger/net.c                  | 4 +++-
 usr.bin/finger/sprint.c               | 4 +++-
 usr.bin/finger/util.c                 | 4 +++-
 usr.bin/fold/fold.c                   | 2 ++
 usr.bin/from/from.c                   | 4 +++-
 usr.bin/fstat/fstat.c                 | 2 ++
 usr.bin/gcore/extern.h                | 2 ++
 usr.bin/gcore/gcore.c                 | 2 ++
 usr.bin/gprof/amd64.h                 | 2 ++
 usr.bin/gprof/aout.c                  | 2 ++
 usr.bin/gprof/arcs.c                  | 4 +++-
 usr.bin/gprof/arm.h                   | 2 ++
 usr.bin/gprof/dfn.c                   | 4 +++-
 usr.bin/gprof/elf.c                   | 2 ++
 usr.bin/gprof/gprof.c                 | 4 +++-
 usr.bin/gprof/gprof.h                 | 4 +++-
 usr.bin/gprof/hertz.c                 | 4 +++-
 usr.bin/gprof/i386.h                  | 2 ++
 usr.bin/gprof/lookup.c                | 4 +++-
 usr.bin/gprof/mips.h                  | 2 ++
 usr.bin/gprof/pathnames.h             | 4 +++-
 usr.bin/gprof/powerpc.h               | 2 ++
 usr.bin/gprof/printgprof.c            | 4 +++-
 usr.bin/gprof/printlist.c             | 4 +++-
 usr.bin/gprof/sparc64.h               | 2 ++
 usr.bin/gzip/zuncompress.c            | 2 ++
 usr.bin/head/head.c                   | 2 ++
 usr.bin/hexdump/conv.c                | 4 +++-
 usr.bin/hexdump/display.c             | 4 +++-
 usr.bin/hexdump/hexdump.c             | 4 +++-
 usr.bin/hexdump/hexdump.h             | 4 +++-
 usr.bin/hexdump/hexsyntax.c           | 2 ++
 usr.bin/hexdump/odsyntax.c            | 2 ++
 usr.bin/hexdump/parse.c               | 4 +++-
 usr.bin/id/id.c                       | 2 ++
 usr.bin/indent/args.c                 | 2 ++
 usr.bin/indent/indent.c               | 2 ++
 usr.bin/indent/indent_codes.h         | 2 ++
 usr.bin/indent/indent_globs.h         | 2 ++
 usr.bin/indent/io.c                   | 2 ++
 usr.bin/indent/lexi.c                 | 2 ++
 usr.bin/indent/parse.c                | 2 ++
 usr.bin/indent/pr_comment.c           | 2 ++
 usr.bin/join/join.c                   | 2 ++
 usr.bin/jot/jot.c                     | 2 ++
 usr.bin/kdump/kdump.c                 | 2 ++
 usr.bin/ktrace/ktrace.c               | 2 ++
 usr.bin/ktrace/ktrace.h               | 2 ++
 usr.bin/ktrace/subr.c                 | 2 ++
 usr.bin/lam/lam.c                     | 2 ++
 usr.bin/last/last.c                   | 2 ++
 usr.bin/lastcomm/lastcomm.c           | 2 ++
 usr.bin/lastcomm/pathnames.h          | 2 ++
 usr.bin/leave/leave.c                 | 2 ++
 usr.bin/lex/initparse.c               | 2 ++
 usr.bin/locate/bigram/locate.bigram.c | 2 ++
 usr.bin/locate/code/locate.code.c     | 2 ++
 usr.bin/locate/locate/fastfind.c      | 2 ++
 usr.bin/locate/locate/locate.c        | 2 ++
 usr.bin/locate/locate/locate.h        | 2 ++
 usr.bin/locate/locate/util.c          | 2 ++
 usr.bin/lock/lock.c                   | 4 +++-
 usr.bin/logger/logger.c               | 4 +++-
 usr.bin/login/login.c                 | 2 ++
 usr.bin/login/login_audit.c           | 4 +++-
 usr.bin/login/pathnames.h             | 2 ++
 usr.bin/logname/logname.c             | 2 ++
 usr.bin/look/look.c                   | 2 ++
 usr.bin/look/pathnames.h              | 2 ++
 usr.bin/lorder/lorder.sh              | 2 ++
 usr.bin/m4/eval.c                     | 4 +++-
 usr.bin/m4/extern.h                   | 2 ++
 usr.bin/m4/look.c                     | 4 +++-
 usr.bin/m4/main.c                     | 2 ++
 usr.bin/m4/mdef.h                     | 4 +++-
 usr.bin/m4/misc.c                     | 4 +++-
 usr.bin/m4/pathnames.h                | 4 +++-
 usr.bin/m4/stdd.h                     | 2 ++
 usr.bin/mail/cmd1.c                   | 2 ++
 usr.bin/mail/cmd2.c                   | 4 +++-
 usr.bin/mail/cmd3.c                   | 4 +++-
 usr.bin/mail/cmdtab.c                 | 4 +++-
 usr.bin/mail/collect.c                | 4 +++-
 usr.bin/mail/def.h                    | 4 +++-
 usr.bin/mail/edit.c                   | 4 +++-
 usr.bin/mail/extern.h                 | 2 ++
 usr.bin/mail/fio.c                    | 4 +++-
 usr.bin/mail/getname.c                | 4 +++-
 usr.bin/mail/glob.h                   | 4 +++-
 usr.bin/mail/head.c                   | 4 +++-
 usr.bin/mail/lex.c                    | 4 +++-
 usr.bin/mail/list.c                   | 4 +++-
 usr.bin/mail/main.c                   | 4 +++-
 usr.bin/mail/names.c                  | 4 +++-
 usr.bin/mail/pathnames.h              | 4 +++-
 usr.bin/mail/popen.c                  | 4 +++-
 usr.bin/mail/quit.c                   | 4 +++-
 usr.bin/mail/rcv.h                    | 4 +++-
 usr.bin/mail/send.c                   | 4 +++-
 usr.bin/mail/strings.c                | 4 +++-
 usr.bin/mail/temp.c                   | 4 +++-
 usr.bin/mail/tty.c                    | 4 +++-
 usr.bin/mail/util.c                   | 4 +++-
 usr.bin/mail/v7.local.c               | 4 +++-
 usr.bin/mail/vars.c                   | 4 +++-
 usr.bin/mail/version.c                | 4 +++-
 usr.bin/mesg/mesg.c                   | 4 +++-
 usr.bin/mkdep/mkdep.gcc.sh            | 2 ++
 usr.bin/mkdep/mkdep.sh                | 2 ++
 usr.bin/mkfifo/mkfifo.c               | 4 +++-
 usr.bin/mklocale/extern.h             | 2 ++
 usr.bin/mklocale/ldef.h               | 2 ++
 usr.bin/mklocale/lex.l                | 2 ++
 usr.bin/mklocale/yacc.y               | 2 ++
 usr.bin/mkstr/mkstr.c                 | 4 +++-
 usr.bin/msgs/msgs.c                   | 2 ++
 usr.bin/msgs/pathnames.h              | 4 +++-
 usr.bin/mt/mt.c                       | 3 ++-
 usr.bin/netstat/if.c                  | 2 ++
 usr.bin/netstat/inet6.c               | 2 ++
 usr.bin/netstat/ipsec.c               | 2 ++
 usr.bin/netstat/main.c                | 2 ++
 usr.bin/netstat/mbuf.c                | 2 ++
 usr.bin/netstat/mroute.c              | 2 ++
 usr.bin/netstat/mroute6.c             | 2 ++
 usr.bin/netstat/netstat.h             | 2 ++
 usr.bin/netstat/pfkey.c               | 2 ++
 usr.bin/netstat/route.c               | 2 ++
 usr.bin/netstat/sctp.c                | 2 ++
 usr.bin/netstat/unix.c                | 2 ++
 usr.bin/nice/nice.c                   | 4 +++-
 usr.bin/nohup/nohup.c                 | 4 +++-
 usr.bin/pagesize/pagesize.sh          | 2 ++
 usr.bin/paste/paste.c                 | 4 +++-
 usr.bin/patch/mkpath.c                | 2 ++
 usr.bin/pr/egetopt.c                  | 2 ++
 usr.bin/pr/extern.h                   | 2 ++
 usr.bin/pr/pr.c                       | 2 ++
 usr.bin/pr/pr.h                       | 2 ++
 usr.bin/printenv/printenv.c           | 2 ++
 usr.bin/printf/printf.c               | 2 ++
 usr.bin/quota/quota.c                 | 2 ++
 usr.bin/renice/renice.c               | 4 +++-
 usr.bin/rev/rev.c                     | 2 ++
 usr.bin/rs/rs.c                       | 2 ++
 usr.bin/rup/rup.c                     | 2 ++
 usr.bin/ruptime/ruptime.c             | 2 ++
 usr.bin/rusers/rusers.c               | 2 ++
 usr.bin/rwall/rwall.c                 | 4 +++-
 usr.bin/rwho/rwho.c                   | 2 ++
 usr.bin/script/script.c               | 2 ++
 usr.bin/sed/compile.c                 | 2 ++
 usr.bin/sed/defs.h                    | 2 ++
 usr.bin/sed/extern.h                  | 2 ++
 usr.bin/sed/main.c                    | 2 ++
 usr.bin/sed/misc.c                    | 2 ++
 usr.bin/sed/process.c                 | 2 ++
 usr.bin/shar/shar.sh                  | 2 ++
 usr.bin/showmount/showmount.c         | 4 +++-
 usr.bin/split/split.c                 | 4 +++-
 usr.bin/su/su.c                       | 4 +++-
 usr.bin/systat/cmds.c                 | 2 ++
 usr.bin/systat/cmdtab.c               | 2 ++
 usr.bin/systat/devs.c                 | 4 +++-
 usr.bin/systat/extern.h               | 2 ++
 usr.bin/systat/fetch.c                | 2 ++
 usr.bin/systat/icmp.c                 | 2 ++
 usr.bin/systat/icmp6.c                | 2 ++
 usr.bin/systat/iostat.c               | 2 ++
 usr.bin/systat/ip.c                   | 2 ++
 usr.bin/systat/ip6.c                  | 2 ++
 usr.bin/systat/keyboard.c             | 2 ++
 usr.bin/systat/main.c                 | 2 ++
 usr.bin/systat/netcmds.c              | 2 ++
 usr.bin/systat/netstat.c              | 2 ++
 usr.bin/systat/pigs.c                 | 2 ++
 usr.bin/systat/swap.c                 | 2 ++
 usr.bin/systat/systat.h               | 2 ++
 usr.bin/systat/tcp.c                  | 2 ++
 usr.bin/systat/vmstat.c               | 2 ++
 usr.bin/tail/extern.h                 | 2 ++
 usr.bin/tail/forward.c                | 2 ++
 usr.bin/tail/misc.c                   | 2 ++
 usr.bin/tail/read.c                   | 2 ++
 usr.bin/tail/reverse.c                | 2 ++
 usr.bin/tail/tail.c                   | 2 ++
 usr.bin/talk/ctl.c                    | 4 +++-
 usr.bin/talk/ctl_transact.c           | 4 +++-
 usr.bin/talk/display.c                | 4 +++-
 usr.bin/talk/get_addrs.c              | 4 +++-
 usr.bin/talk/get_names.c              | 4 +++-
 usr.bin/talk/init_disp.c              | 4 +++-
 usr.bin/talk/invite.c                 | 4 +++-
 usr.bin/talk/io.c                     | 4 +++-
 usr.bin/talk/look_up.c                | 4 +++-
 usr.bin/talk/msgs.c                   | 4 +++-
 usr.bin/talk/talk.c                   | 4 +++-
 usr.bin/talk/talk.h                   | 4 +++-
 usr.bin/talk/talk_ctl.h               | 4 +++-
 usr.bin/tcopy/tcopy.c                 | 4 +++-
 usr.bin/tee/tee.c                     | 4 +++-
 usr.bin/tftp/main.c                   | 4 +++-
 usr.bin/tftp/tftp.c                   | 4 +++-
 usr.bin/tftp/tftp.h                   | 4 +++-
 usr.bin/time/time.c                   | 4 +++-
 usr.bin/tip/libacu/biz22.c            | 4 +++-
 usr.bin/tip/libacu/biz31.c            | 4 +++-
 usr.bin/tip/libacu/courier.c          | 4 +++-
 usr.bin/tip/libacu/df.c               | 4 +++-
 usr.bin/tip/libacu/dn11.c             | 4 +++-
 usr.bin/tip/libacu/hayes.c            | 4 +++-
 usr.bin/tip/libacu/t3000.c            | 4 +++-
 usr.bin/tip/libacu/v3451.c            | 4 +++-
 usr.bin/tip/libacu/v831.c             | 4 +++-
 usr.bin/tip/libacu/ventel.c           | 4 +++-
 usr.bin/tip/tip/acu.c                 | 4 +++-
 usr.bin/tip/tip/acutab.c              | 4 +++-
 usr.bin/tip/tip/cmds.c                | 4 +++-
 usr.bin/tip/tip/cmdtab.c              | 4 +++-
 usr.bin/tip/tip/cu.c                  | 4 +++-
 usr.bin/tip/tip/hunt.c                | 4 +++-
 usr.bin/tip/tip/log.c                 | 4 +++-
 usr.bin/tip/tip/partab.c              | 4 +++-
 usr.bin/tip/tip/pathnames.h           | 4 +++-
 usr.bin/tip/tip/remote.c              | 4 +++-
 usr.bin/tip/tip/tip.c                 | 4 +++-
 usr.bin/tip/tip/tip.h                 | 4 +++-
 usr.bin/tip/tip/tipout.c              | 4 +++-
 usr.bin/tip/tip/uucplock.c            | 4 +++-
 usr.bin/tip/tip/value.c               | 4 +++-
 usr.bin/tip/tip/vars.c                | 4 +++-
 usr.bin/touch/touch.c                 | 4 +++-
 usr.bin/tput/clear.sh                 | 2 ++
 usr.bin/tput/tput.c                   | 2 ++
 usr.bin/tr/extern.h                   | 2 ++
 usr.bin/tr/str.c                      | 2 ++
 usr.bin/tr/tr.c                       | 4 +++-
 usr.bin/true/true.c                   | 4 +++-
 usr.bin/truss/amd64-freebsd.c         | 4 +++-
 usr.bin/truss/amd64-freebsd32.c       | 4 +++-
 usr.bin/truss/amd64-linux.c           | 4 +++-
 usr.bin/truss/amd64-linux32.c         | 4 +++-
 usr.bin/truss/arm-freebsd.c           | 4 +++-
 usr.bin/truss/extern.h                | 4 +++-
 usr.bin/truss/i386-freebsd.c          | 4 +++-
 usr.bin/truss/i386-linux.c            | 4 +++-
 usr.bin/truss/main.c                  | 2 ++
 usr.bin/truss/mips-freebsd.c          | 4 +++-
 usr.bin/truss/setup.c                 | 2 ++
 usr.bin/truss/sparc64-freebsd.c       | 4 +++-
 usr.bin/truss/syscalls.c              | 4 +++-
 usr.bin/tset/extern.h                 | 2 ++
 usr.bin/tset/map.c                    | 2 ++
 usr.bin/tset/misc.c                   | 2 ++
 usr.bin/tset/set.c                    | 2 ++
 usr.bin/tset/term.c                   | 2 ++
 usr.bin/tset/tset.c                   | 2 ++
 usr.bin/tset/wrterm.c                 | 2 ++
 usr.bin/tsort/tsort.c                 | 4 +++-
 usr.bin/tty/tty.c                     | 4 +++-
 usr.bin/ul/ul.c                       | 4 +++-
 usr.bin/uname/uname.c                 | 2 ++
 usr.bin/unexpand/unexpand.c           | 2 ++
 usr.bin/uniq/uniq.c                   | 4 +++-
 usr.bin/uudecode/uudecode.c           | 2 ++
 usr.bin/uuencode/uuencode.c           | 2 ++
 usr.bin/vgrind/extern.h               | 4 +++-
 usr.bin/vgrind/pathnames.h            | 4 +++-
 usr.bin/vgrind/regexp.c               | 4 +++-
 usr.bin/vgrind/vfontedpr.c            | 4 +++-
 usr.bin/vgrind/vgrind.sh              | 2 ++
 usr.bin/vmstat/vmstat.c               | 4 +++-
 usr.bin/w/extern.h                    | 2 ++
 usr.bin/w/pr_time.c                   | 2 ++
 usr.bin/w/proc_compare.c              | 2 ++
 usr.bin/w/w.c                         | 2 ++
 usr.bin/wall/ttymsg.c                 | 4 +++-
 usr.bin/wall/wall.c                   | 4 +++-
 usr.bin/wc/wc.c                       | 4 +++-
 usr.bin/what/what.c                   | 4 +++-
 usr.bin/whois/whois.c                 | 2 ++
 usr.bin/write/write.c                 | 4 +++-
 usr.bin/xargs/pathnames.h             | 2 ++
 usr.bin/xargs/xargs.c                 | 2 ++
 usr.bin/xinstall/xinstall.c           | 4 +++-
 usr.bin/xstr/pathnames.h              | 4 +++-
 usr.bin/xstr/xstr.c                   | 4 +++-
 usr.bin/yes/yes.c                     | 4 +++-
 351 files changed, 867 insertions(+), 166 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index c886660..1d55870 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index c1050aa..e902a8f 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2007 Kai Wang
  * Copyright (c) 2007 Tim Kientzle
  * Copyright (c) 2007 Joseph Koshy
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index a968c7f..fab8220 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index 4c1023f..ae4fe3f 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index 0adda01..e55415b 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 84d1880..fd54796 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/calendar/calendar.h b/usr.bin/calendar/calendar.h
index 1113c4a..22f0881 100644
--- a/usr.bin/calendar/calendar.h
+++ b/usr.bin/calendar/calendar.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index dac6115..9d52278 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 493488d..f4eda36 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/calendar/locale.c b/usr.bin/calendar/locale.c
index 7018428..4afeef2 100644
--- a/usr.bin/calendar/locale.c
+++ b/usr.bin/calendar/locale.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/calendar/pathnames.h b/usr.bin/calendar/pathnames.h
index e5507a1..abe541c 100644
--- a/usr.bin/calendar/pathnames.h
+++ b/usr.bin/calendar/pathnames.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/calendar/pom.c b/usr.bin/calendar/pom.c
index 671763a..8c1f756 100644
--- a/usr.bin/calendar/pom.c
+++ b/usr.bin/calendar/pom.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index 2f8bd96..e3f8440 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 9f9be53..ab71872 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1988, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h
index fd3a839..b655c5d 100644
--- a/usr.bin/chpass/chpass.h
+++ b/usr.bin/chpass/chpass.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1988, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index ce82f8e..fbe1015 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c
index eac5561..3b5129c 100644
--- a/usr.bin/chpass/field.c
+++ b/usr.bin/chpass/field.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1988, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c
index a4918b4..7c6c6dd 100644
--- a/usr.bin/chpass/table.c
+++ b/usr.bin/chpass/table.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index baf160e..bfece1d 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1988, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index 05dc8bb..857c515 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
index a76876a9..65393f4 100644
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h
index 84ec8d2..b5fc9b4 100644
--- a/usr.bin/cksum/extern.h
+++ b/usr.bin/cksum/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c
index 912ffd6..1df4c42 100644
--- a/usr.bin/cksum/print.c
+++ b/usr.bin/cksum/print.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
index 60640a7..5b669d2 100644
--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index 540d9e5..1d00c60 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index f3ac717..eb6abfff 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h
index a35cc3d..d387c25 100644
--- a/usr.bin/cmp/extern.h
+++ b/usr.bin/cmp/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 0e94ea5..09f59f7 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index 7ed83c1..d872143 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index edb641c..2edf935 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 13df126..0f5049c 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index c37a3ca..25a4048 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index eb8ca66..c3e1207 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 54763e1..684fb62 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index 87494e3..3e8209c 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index 8ae3d7d..e99fb05 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1985, 1986, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index 2287848..8c16b36 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index 2819840..d037eae 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993, 1994, 1995
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/ctags/ctags.h b/usr.bin/ctags/ctags.h
index 597723d..3b3ac10 100644
--- a/usr.bin/ctags/ctags.h
+++ b/usr.bin/ctags/ctags.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index 66d4b54..c5d4822 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index 0d0e2c2..3977114 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index ca5b9de..27f8c61 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index b9b2c7a..96e5e91 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index 5678da5..cd22509 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index e343e5a..32d8c79 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index c176995..59c8eda 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index c121699..3369677 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index 3dc152a..931a7c6 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1988, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 1d89089..a22295f 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/false/false.c b/usr.bin/false/false.c
index 99948bc..cba9cb8 100644
--- a/usr.bin/false/false.c
+++ b/usr.bin/false/false.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.
  *
diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h
index b2e344a..206fa85 100644
--- a/usr.bin/find/extern.h
+++ b/usr.bin/find/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c
index 3e5d56b..240e28d 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/find/find.h b/usr.bin/find/find.h
index 53cb69f..cf7fb9b 100644
--- a/usr.bin/find/find.h
+++ b/usr.bin/find/find.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 68372c7..9795aee 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index 953c456..4eb394d 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index bcbeed5..732efa4 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index df2e502..4d5be89 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index b8a6fe4..8333a32 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index 4fc63b6..d73c44a 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/finger/extern.h b/usr.bin/finger/extern.h
index cc2a203..4176afb 100644
--- a/usr.bin/finger/extern.h
+++ b/usr.bin/finger/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index 0a4e952..f01dd2b 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index 2b70554..2481558f 100644
--- a/usr.bin/finger/finger.h
+++ b/usr.bin/finger/finger.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index db902df..349b3c2 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index db5f96d..a21f61a 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index afbab4e..6725ecb 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index b7d0d2a..07cf97c 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 1ce9b5e..662d372 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 2262703..d07f134 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 1aeee67..3d1349f 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2009 Stanislav Sedov <stas@FreeBSD.org>
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/gcore/extern.h b/usr.bin/gcore/extern.h
index cf8a44f..0b4c352 100644
--- a/usr.bin/gcore/extern.h
+++ b/usr.bin/gcore/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index e036c91..72d058e 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/amd64.h b/usr.bin/gprof/amd64.h
index 58b92c5..ee87a87 100644
--- a/usr.bin/gprof/amd64.h
+++ b/usr.bin/gprof/amd64.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/aout.c b/usr.bin/gprof/aout.c
index 7907d46..f7350fd 100644
--- a/usr.bin/gprof/aout.c
+++ b/usr.bin/gprof/aout.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index 4bea6c6..6cb4716 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/arm.h b/usr.bin/gprof/arm.h
index 58b92c5..ee87a87 100644
--- a/usr.bin/gprof/arm.h
+++ b/usr.bin/gprof/arm.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c
index a49cd31..a5439fa 100644
--- a/usr.bin/gprof/dfn.c
+++ b/usr.bin/gprof/dfn.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/elf.c b/usr.bin/gprof/elf.c
index 3d9c136..47bb563 100644
--- a/usr.bin/gprof/elf.c
+++ b/usr.bin/gprof/elf.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index 879b0ac..67009e1 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/gprof.h b/usr.bin/gprof/gprof.h
index c8140eb..bd4cb35 100644
--- a/usr.bin/gprof/gprof.h
+++ b/usr.bin/gprof/gprof.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/hertz.c b/usr.bin/gprof/hertz.c
index 9a8a2b1..5c4e868 100644
--- a/usr.bin/gprof/hertz.c
+++ b/usr.bin/gprof/hertz.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/i386.h b/usr.bin/gprof/i386.h
index 58b92c5..ee87a87 100644
--- a/usr.bin/gprof/i386.h
+++ b/usr.bin/gprof/i386.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c
index 0ef1e0b..1db906f 100644
--- a/usr.bin/gprof/lookup.c
+++ b/usr.bin/gprof/lookup.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/mips.h b/usr.bin/gprof/mips.h
index e6a1c9c..0266a32 100644
--- a/usr.bin/gprof/mips.h
+++ b/usr.bin/gprof/mips.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/pathnames.h b/usr.bin/gprof/pathnames.h
index f88bea0..0df0368 100644
--- a/usr.bin/gprof/pathnames.h
+++ b/usr.bin/gprof/pathnames.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/powerpc.h b/usr.bin/gprof/powerpc.h
index 58b92c5..ee87a87 100644
--- a/usr.bin/gprof/powerpc.h
+++ b/usr.bin/gprof/powerpc.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 303365a..1ac187d 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index a8eb6b6..9e1bc49 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gprof/sparc64.h b/usr.bin/gprof/sparc64.h
index 58b92c5..ee87a87 100644
--- a/usr.bin/gprof/sparc64.h
+++ b/usr.bin/gprof/sparc64.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/gzip/zuncompress.c b/usr.bin/gzip/zuncompress.c
index d99e70f..b2f3e8d 100644
--- a/usr.bin/gzip/zuncompress.c
+++ b/usr.bin/gzip/zuncompress.c
@@ -1,6 +1,8 @@
 /*	$NetBSD: zuncompress.c,v 1.11 2011/08/16 13:55:02 joerg Exp $ */
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1985, 1986, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index e1caa1f..d558c76 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1987, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/hexdump/conv.c b/usr.bin/hexdump/conv.c
index 5a04fc4..72f7db1 100644
--- a/usr.bin/hexdump/conv.c
+++ b/usr.bin/hexdump/conv.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index 3b33f4d..a060c3b 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index d3c4bb5..bdc5c32 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h
index e34d3a0..2fcc625 100644
--- a/usr.bin/hexdump/hexdump.h
+++ b/usr.bin/hexdump/hexdump.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index ac1971a..82f1d78 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index ebcb720..c37a0b4 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index 1e06120..bf9f8fc 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index 345e2a6..023fe1f 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index cab0f7d..09df243 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index b463579..c461017 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1976 Board of Trustees of the University of Illinois.
  * Copyright (c) 1980, 1993
diff --git a/usr.bin/indent/indent_codes.h b/usr.bin/indent/indent_codes.h
index a58b90a..45be777 100644
--- a/usr.bin/indent/indent_codes.h
+++ b/usr.bin/indent/indent_codes.h
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/indent/indent_globs.h b/usr.bin/indent/indent_globs.h
index 2ea1d8d..910fc8d 100644
--- a/usr.bin/indent/indent_globs.h
+++ b/usr.bin/indent/indent_globs.h
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 4a3db83..66972c7 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c
index 3425f9a..baa66a9 100644
--- a/usr.bin/indent/lexi.c
+++ b/usr.bin/indent/lexi.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c
index 65d9a6b..bf90060 100644
--- a/usr.bin/indent/parse.c
+++ b/usr.bin/indent/parse.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/indent/pr_comment.c b/usr.bin/indent/pr_comment.c
index 9524bf4..e2169a0 100644
--- a/usr.bin/indent/pr_comment.c
+++ b/usr.bin/indent/pr_comment.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index afa7cbc..74f7dc7 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 779a4b9..382b8a2 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index 7db1a8b..a5fdca5 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.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.
  *
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index f993d37..245fc52 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.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.
  *
diff --git a/usr.bin/ktrace/ktrace.h b/usr.bin/ktrace/ktrace.h
index f016516..4b22e4f 100644
--- a/usr.bin/ktrace/ktrace.h
+++ b/usr.bin/ktrace/ktrace.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index eacd44c..6ca29f1 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.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.
  *
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 60d1c52..f4efb8f 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index 1db10b3..32e5dcd 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index b2a0f0f..fe0f600 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/lastcomm/pathnames.h b/usr.bin/lastcomm/pathnames.h
index 7415545..e00c8be 100644
--- a/usr.bin/lastcomm/pathnames.h
+++ b/usr.bin/lastcomm/pathnames.h
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index 29c89e5..002cc23 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/lex/initparse.c b/usr.bin/lex/initparse.c
index 9bfd5cd..d5736cd 100644
--- a/usr.bin/lex/initparse.c
+++ b/usr.bin/lex/initparse.c
@@ -17,6 +17,8 @@ static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
 #define YYPURE 0
 
 #line 35 "parse.y"
+/ * SPDX-License-Identifier: BSD-2-Clause */
+
 /*  Copyright (c) 1990 The Regents of the University of California. */
 /*  All rights reserved. */
 
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index 6fa2d31..fe0011e 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index 9a87c16..18ee68c 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/locate/locate/fastfind.c b/usr.bin/locate/locate/fastfind.c
index c15730b..e2f6d74 100644
--- a/usr.bin/locate/locate/fastfind.c
+++ b/usr.bin/locate/locate/fastfind.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 3a87b14..7c62659 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
  *      The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index c2f27fb..7b4f672 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index 9130e37..88e8a05 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 8c12946..257a961 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index 49360f4..f811159 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 525ccfc..e99ee5e 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 2002 Networks Associates Technologies, Inc.
diff --git a/usr.bin/login/login_audit.c b/usr.bin/login/login_audit.c
index 210f2d7..edb198d 100644
--- a/usr.bin/login/login_audit.c
+++ b/usr.bin/login/login_audit.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2005 Apple Computer, Inc.
  * All rights reserved.
  *
diff --git a/usr.bin/login/pathnames.h b/usr.bin/login/pathnames.h
index 836725f..05750bf 100644
--- a/usr.bin/login/pathnames.h
+++ b/usr.bin/login/pathnames.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index 8a251ae..87dea2b 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index ada6e25..10fedbb 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/look/pathnames.h b/usr.bin/look/pathnames.h
index bd870e2..6a16dbe 100644
--- a/usr.bin/look/pathnames.h
+++ b/usr.bin/look/pathnames.h
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/lorder/lorder.sh b/usr.bin/lorder/lorder.sh
index 4b6243c..bfa296b 100644
--- a/usr.bin/lorder/lorder.sh
+++ b/usr.bin/lorder/lorder.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -
 #
+# SPDX-License-Identifier: BSD-3-Clause
+#
 # Copyright (c) 1990, 1993
 #	The Regents of the University of California.  All rights reserved.
 #
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index f3d72b6..34d956e 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: eval.c,v 1.74 2015/02/05 12:59:57 millert Exp $	*/
 /*	$NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index 6d410d8..165f573 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -2,6 +2,8 @@
 /*	$NetBSD: extern.h,v 1.3 1996/01/13 23:25:24 pk Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index 383fbc6..acda959 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -1,6 +1,8 @@
 /*	$OpenBSD: look.c,v 1.24 2014/12/21 09:33:12 espie Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index 92d1ea3..c43dedd 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -2,6 +2,8 @@
 /*	$NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h
index fc2d32a..b15f2b5 100644
--- a/usr.bin/m4/mdef.h
+++ b/usr.bin/m4/mdef.h
@@ -1,7 +1,9 @@
 /*	$OpenBSD: mdef.h,v 1.33 2015/11/03 16:21:47 deraadt Exp $	*/
 /*	$NetBSD: mdef.h,v 1.7 1996/01/13 23:25:27 pk Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index aeafea9..5b7fb30 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: misc.c,v 1.46 2015/12/07 14:12:46 espie Exp $	*/
 /*	$NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/m4/pathnames.h b/usr.bin/m4/pathnames.h
index 668111c..742edc1 100644
--- a/usr.bin/m4/pathnames.h
+++ b/usr.bin/m4/pathnames.h
@@ -1,7 +1,9 @@
 /*	$OpenBSD: pathnames.h,v 1.6 2015/11/03 16:21:47 deraadt Exp $	*/
 /*	$NetBSD: pathnames.h,v 1.6 1995/09/29 00:27:55 cgd Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/m4/stdd.h b/usr.bin/m4/stdd.h
index 85e6b00..2ef1bb1 100644
--- a/usr.bin/m4/stdd.h
+++ b/usr.bin/m4/stdd.h
@@ -2,6 +2,8 @@
 /*	$NetBSD: stdd.h,v 1.2 1995/09/28 05:37:50 tls Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 4782ec9..10c7210 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index dd7f6dd..20b25cf 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/cmd3.c b/usr.bin/mail/cmd3.c
index 11954d1..1836a13 100644
--- a/usr.bin/mail/cmd3.c
+++ b/usr.bin/mail/cmd3.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c
index eb19bc4..d691859 100644
--- a/usr.bin/mail/cmdtab.c
+++ b/usr.bin/mail/cmdtab.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c
index a70c156..4b73def 100644
--- a/usr.bin/mail/collect.c
+++ b/usr.bin/mail/collect.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/def.h b/usr.bin/mail/def.h
index e637252..fb9ad23 100644
--- a/usr.bin/mail/def.h
+++ b/usr.bin/mail/def.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c
index f9e974d..8c733c3 100644
--- a/usr.bin/mail/edit.c
+++ b/usr.bin/mail/edit.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h
index 2578d65..aeb06dc 100644
--- a/usr.bin/mail/extern.h
+++ b/usr.bin/mail/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index d9d4ee1..3638938 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/getname.c b/usr.bin/mail/getname.c
index 4f06354..b3db32c 100644
--- a/usr.bin/mail/getname.c
+++ b/usr.bin/mail/getname.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/glob.h b/usr.bin/mail/glob.h
index a2eeea3..e0ff386 100644
--- a/usr.bin/mail/glob.h
+++ b/usr.bin/mail/glob.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/head.c b/usr.bin/mail/head.c
index d836ce4..f4c528f 100644
--- a/usr.bin/mail/head.c
+++ b/usr.bin/mail/head.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index 4d799e7..47137e3 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c
index 3a5cc15..e6af32a 100644
--- a/usr.bin/mail/list.c
+++ b/usr.bin/mail/list.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index 0699a55..0548ca1 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c
index 724d201..e7e0ece 100644
--- a/usr.bin/mail/names.c
+++ b/usr.bin/mail/names.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/pathnames.h b/usr.bin/mail/pathnames.h
index 17dd106..cda00be 100644
--- a/usr.bin/mail/pathnames.h
+++ b/usr.bin/mail/pathnames.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/popen.c b/usr.bin/mail/popen.c
index 60a0936..85feb5d 100644
--- a/usr.bin/mail/popen.c
+++ b/usr.bin/mail/popen.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/quit.c b/usr.bin/mail/quit.c
index 4b9bcda..e432c60 100644
--- a/usr.bin/mail/quit.c
+++ b/usr.bin/mail/quit.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/rcv.h b/usr.bin/mail/rcv.h
index 0ee7f2d..18481d9 100644
--- a/usr.bin/mail/rcv.h
+++ b/usr.bin/mail/rcv.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/send.c b/usr.bin/mail/send.c
index a199323..57e2f12 100644
--- a/usr.bin/mail/send.c
+++ b/usr.bin/mail/send.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/strings.c b/usr.bin/mail/strings.c
index ec9334e..5493228 100644
--- a/usr.bin/mail/strings.c
+++ b/usr.bin/mail/strings.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index d274467..4b197b2 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c
index f8635a2..8215948 100644
--- a/usr.bin/mail/tty.c
+++ b/usr.bin/mail/tty.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/util.c b/usr.bin/mail/util.c
index 43a0a55..3c7a4e1 100644
--- a/usr.bin/mail/util.c
+++ b/usr.bin/mail/util.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c
index 0da7b3b..39c1773 100644
--- a/usr.bin/mail/v7.local.c
+++ b/usr.bin/mail/v7.local.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c
index f3c6659..699fb80 100644
--- a/usr.bin/mail/vars.c
+++ b/usr.bin/mail/vars.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mail/version.c b/usr.bin/mail/version.c
index 379fda8..c59592b 100644
--- a/usr.bin/mail/version.c
+++ b/usr.bin/mail/version.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 796a047..056e6e8 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index ac97621..0f0f636 100644
--- a/usr.bin/mkdep/mkdep.gcc.sh
+++ b/usr.bin/mkdep/mkdep.gcc.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -
 #
+# SPDX-License-Identifier: BSD-3-Clause
+#
 # Copyright (c) 1991, 1993
 #	The Regents of the University of California.  All rights reserved.
 #
diff --git a/usr.bin/mkdep/mkdep.sh b/usr.bin/mkdep/mkdep.sh
index 8524508..72d431b 100644
--- a/usr.bin/mkdep/mkdep.sh
+++ b/usr.bin/mkdep/mkdep.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -
 #
+# SPDX-License-Identifier: BSD-3-Clause
+#
 # Copyright (c) 1991, 1993
 #	The Regents of the University of California.  All rights reserved.
 #
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 7c974bd..4e4b581 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mklocale/extern.h b/usr.bin/mklocale/extern.h
index 60268cc..6684cbb 100644
--- a/usr.bin/mklocale/extern.h
+++ b/usr.bin/mklocale/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mklocale/ldef.h b/usr.bin/mklocale/ldef.h
index 392252f..fe39445 100644
--- a/usr.bin/mklocale/ldef.h
+++ b/usr.bin/mklocale/ldef.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mklocale/lex.l b/usr.bin/mklocale/lex.l
index 08fa54a..9f85e81 100644
--- a/usr.bin/mklocale/lex.l
+++ b/usr.bin/mklocale/lex.l
@@ -1,5 +1,7 @@
 %{
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index 01f9f49..28077bb0 100644
--- a/usr.bin/mklocale/yacc.y
+++ b/usr.bin/mklocale/yacc.y
@@ -1,5 +1,7 @@
 %{
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index 2025eff..79a223f 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index 832e86a..e34e387 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/msgs/pathnames.h b/usr.bin/msgs/pathnames.h
index 541d510..f38c115 100644
--- a/usr.bin/msgs/pathnames.h
+++ b/usr.bin/msgs/pathnames.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index 985a04e..e44fe63 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1980, 1993
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 6fb8e63..16fc61e 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2013 Gleb Smirnoff <glebius@FreeBSD.org>
  * Copyright (c) 1983, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 24e2b88..62c1d9d 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -1,5 +1,7 @@
 /*	BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp	*/
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c
index 69ca6c9..040c62d 100644
--- a/usr.bin/netstat/ipsec.c
+++ b/usr.bin/netstat/ipsec.c
@@ -1,6 +1,8 @@
 /*	$KAME: ipsec.c,v 1.33 2003/07/25 09:54:32 itojun Exp $	*/
 
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2005 NTT Multimedia Communications Laboratories, Inc.
  * All rights reserved.
  *
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index da69afc..b69b244 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1988, 1993
  *	Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 8b95ddd..bb3dce99 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1983, 1988, 1993
  *	The Regents of the University of California.
  * Copyright (c) 2005 Robert N. M. Watson
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index d4d6014..afc5458 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1989 Stephen Deering
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index 8f59c6b..6360fd6 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause
+ *
  * Copyright (C) 1998 WIDE Project.
  * All rights reserved.
  *
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index ee30d3a..24d5fbe 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992, 1993
  *	Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/netstat/pfkey.c b/usr.bin/netstat/pfkey.c
index e12181b..03ae82d 100644
--- a/usr.bin/netstat/pfkey.c
+++ b/usr.bin/netstat/pfkey.c
@@ -1,6 +1,8 @@
 /*	$NetBSD: inet.c,v 1.35.2.1 1999/04/29 14:57:08 perry Exp $	*/
 /*	$KAME: ipsec.c,v 1.25 2001/03/12 09:04:39 itojun Exp $	*/
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
  * All rights reserved.
  *
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 713934f..824e91c 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c
index 084e9ec..5f67e91 100644
--- a/usr.bin/netstat/sctp.c
+++ b/usr.bin/netstat/sctp.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2001-2007, by Weongyo Jeong. All rights reserved.
  * Copyright (c) 2011, by Michael Tuexen. All rights reserved.
  *
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index b8cddc8..3212ac0 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index 9fab9e4..6e71b46 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index beb1a35..49b12b5 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/pagesize/pagesize.sh b/usr.bin/pagesize/pagesize.sh
index 07b9b3a..863b69b 100644
--- a/usr.bin/pagesize/pagesize.sh
+++ b/usr.bin/pagesize/pagesize.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -
 #
+# SPDX-License-Identifier: BSD-3-Clause
+#
 # Copyright (c) 1994
 #	The Regents of the University of California.  All rights reserved.
 #
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index f03f784..608d725 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/patch/mkpath.c b/usr.bin/patch/mkpath.c
index 04fd537..2214d4d 100644
--- a/usr.bin/patch/mkpath.c
+++ b/usr.bin/patch/mkpath.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 22a093a..4c60204 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1991 Keith Muller.
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h
index c39e18f..b44eb41 100644
--- a/usr.bin/pr/extern.h
+++ b/usr.bin/pr/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1991 Keith Muller.
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 0493aec..cc6d290 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1991 Keith Muller.
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/pr/pr.h b/usr.bin/pr/pr.h
index a4346c7..2c9e50f 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1991 Keith Muller.
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index 27882ab..3acef4b 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index 8636cc1..7f602bd 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright 2014 Garrett D'Amore <garrett@damore.org>
  * Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 1989, 1993
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index c88f2aa..838fa8c 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 8c8a26e..ed6c9cf 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index a048427..511aa87 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index 3f50868..a4516d5 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 239b313..5f4f2b4 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1993, John Brezak
  * All rights reserved.
  *
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 2f791be..4bd4491 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 4d641dc..381d935 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1993, John Brezak
  * All rights reserved.
  *
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index c235ea7..2daa6a8 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1993 Christopher G. Demetriou
  * Copyright (c) 1988, 1990 Regents of the University of California.
  * All rights reserved.
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index 3fb0da5..c5a6cc9 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993 The Regents of the University of California.
  * Copyright (c) 2013 Mariusz Zaborski <oshogbo@FreeBSD.org>
  * All rights reserved.
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 0128463..e94fc6d 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2010, 2012  David E. O'Brien
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index 3e79097..ffce09e 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992 Diomidis Spinellis.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/sed/defs.h b/usr.bin/sed/defs.h
index fb33676..154abbf 100644
--- a/usr.bin/sed/defs.h
+++ b/usr.bin/sed/defs.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992 Diomidis Spinellis.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/sed/extern.h b/usr.bin/sed/extern.h
index f2bd71b..36c945f0 100644
--- a/usr.bin/sed/extern.h
+++ b/usr.bin/sed/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992 Diomidis Spinellis.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 2307205..4a756ae 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2013 Johann 'Myrkraverk' Oskarsson.
  * Copyright (c) 1992 Diomidis Spinellis.
  * Copyright (c) 1992, 1993
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index f3b5137..6a714b0 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992 Diomidis Spinellis.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index 33eea13..2d6ed64 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992 Diomidis Spinellis.
  * Copyright (c) 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/shar/shar.sh b/usr.bin/shar/shar.sh
index 3573013..4d81860 100644
--- a/usr.bin/shar/shar.sh
+++ b/usr.bin/shar/shar.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -
 #
+# SPDX-License-Identifier: BSD-3-Clause
+#
 # Copyright (c) 1990, 1993
 #	The Regents of the University of California.  All rights reserved.
 #
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index 01c9e26..a0bcdc1 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993, 1995
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index 9a0b0ec..ca15db6 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index e27a4aa..b8e00a7 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2002, 2005 Networks Associates Technologies, Inc.
  * All rights reserved.
  *
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index f461f94..07da7ab 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index cb021e0..488310c 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c
index 3c74fb7..d6ded46 100644
--- a/usr.bin/systat/devs.c
+++ b/usr.bin/systat/devs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1998 Kenneth D. Merry.
  * All rights reserved.
  *
diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h
index 272eead..e8c37b9 100644
--- a/usr.bin/systat/extern.h
+++ b/usr.bin/systat/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c
index d159e51..8e53ffd 100644
--- a/usr.bin/systat/fetch.c
+++ b/usr.bin/systat/fetch.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index 6085a90..2be26a0 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/icmp6.c b/usr.bin/systat/icmp6.c
index 2a3bbb7..6c48ed6 100644
--- a/usr.bin/systat/icmp6.c
+++ b/usr.bin/systat/icmp6.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index fa275eb..538be90 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -1,4 +1,6 @@
 /*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1998 Kenneth D. Merry.
  * All rights reserved.
  *
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index 8e12a6a..b634324 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/ip6.c b/usr.bin/systat/ip6.c
index 5d2c210..72e8bc5 100644
--- a/usr.bin/systat/ip6.c
+++ b/usr.bin/systat/ip6.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/keyboard.c b/usr.bin/systat/keyboard.c
index d6d793a..d7a4975 100644
--- a/usr.bin/systat/keyboard.c
+++ b/usr.bin/systat/keyboard.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 74195f6..b074fb3 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index a91af38..353b9bd 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 90ddd25..8b8bd06 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index d341f7d..2b5d038 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index 799dff95..d3b7752 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index ebd409e..ed23957 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1989, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index c9e8e9a..4e0f188 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 25f79d7..461c4291 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1989, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tail/extern.h b/usr.bin/tail/extern.h
index dfc63d0..6069ea5 100644
--- a/usr.bin/tail/extern.h
+++ b/usr.bin/tail/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index 5eaae98..e556fec 100644
--- a/usr.bin/tail/forward.c
+++ b/usr.bin/tail/forward.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c
index 6944325..ed46296 100644
--- a/usr.bin/tail/misc.c
+++ b/usr.bin/tail/misc.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c
index 79c4fa5..b440d1b 100644
--- a/usr.bin/tail/read.c
+++ b/usr.bin/tail/read.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 88c328a..0353a42 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index e5566cb..57fcaf8 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index 0704b28..771f16f 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index 687de1e..c0b51c9 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 0acf1ce..8b4c190 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index b2af685..7ff3ebd 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index 8da8e4a..5aafe95 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index 47556c9..1abd5225 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index e48302f..6c37dfb 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index eb5df61..a4b6e79 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index 309f1be..aedd77e 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index e36b37a..214c6f2 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index 9bd049f..e1beb69 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h
index 34ff870..649c1b4 100644
--- a/usr.bin/talk/talk.h
+++ b/usr.bin/talk/talk.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/talk/talk_ctl.h b/usr.bin/talk/talk_ctl.h
index e3e750b..541d1f3 100644
--- a/usr.bin/talk/talk_ctl.h
+++ b/usr.bin/talk/talk_ctl.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index 4fa0a33..1abc257 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1985, 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index 302bb97..340f3cc 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.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.
  *
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 188ce68..4176cb6 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index eaf2a6f..2c5ec84 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tftp/tftp.h b/usr.bin/tftp/tftp.h
index 4cdef25..9632f74 100644
--- a/usr.bin/tftp/tftp.h
+++ b/usr.bin/tftp/tftp.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 678a2af..57775ba 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/libacu/biz22.c b/usr.bin/tip/libacu/biz22.c
index 99b6fb0..7e0a2ac 100644
--- a/usr.bin/tip/libacu/biz22.c
+++ b/usr.bin/tip/libacu/biz22.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: biz22.c,v 1.13 2006/03/17 19:17:13 moritz Exp $	*/
 /*	$NetBSD: biz22.c,v 1.6 1997/02/11 09:24:11 mrg Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/libacu/biz31.c b/usr.bin/tip/libacu/biz31.c
index 5bc00ae..dc8f26a 100644
--- a/usr.bin/tip/libacu/biz31.c
+++ b/usr.bin/tip/libacu/biz31.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: biz31.c,v 1.10 2006/03/17 19:17:13 moritz Exp $	*/
 /*	$NetBSD: biz31.c,v 1.5 1997/02/11 09:24:14 mrg Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/libacu/courier.c b/usr.bin/tip/libacu/courier.c
index b23c28c..a0a9b5c 100644
--- a/usr.bin/tip/libacu/courier.c
+++ b/usr.bin/tip/libacu/courier.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: courier.c,v 1.15 2006/03/17 19:17:13 moritz Exp $	*/
 /*	$NetBSD: courier.c,v 1.7 1997/02/11 09:24:16 mrg Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/libacu/df.c b/usr.bin/tip/libacu/df.c
index 03374e1..cef9608 100644
--- a/usr.bin/tip/libacu/df.c
+++ b/usr.bin/tip/libacu/df.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: df.c,v 1.9 2006/03/17 19:17:13 moritz Exp $	*/
 /*	$NetBSD: df.c,v 1.4 1995/10/29 00:49:51 pk Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/libacu/dn11.c b/usr.bin/tip/libacu/dn11.c
index a0b18ba..385ba8b 100644
--- a/usr.bin/tip/libacu/dn11.c
+++ b/usr.bin/tip/libacu/dn11.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: dn11.c,v 1.9 2006/03/17 19:17:13 moritz Exp $	*/
 /*	$NetBSD: dn11.c,v 1.4 1995/10/29 00:49:53 pk Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/libacu/hayes.c b/usr.bin/tip/libacu/hayes.c
index fe52274..12e8401 100644
--- a/usr.bin/tip/libacu/hayes.c
+++ b/usr.bin/tip/libacu/hayes.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: hayes.c,v 1.13 2006/03/17 19:17:13 moritz Exp $	*/
 /*	$NetBSD: hayes.c,v 1.6 1997/02/11 09:24:17 mrg Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/libacu/t3000.c b/usr.bin/tip/libacu/t3000.c
index a640ff3..861d8d0 100644
--- a/usr.bin/tip/libacu/t3000.c
+++ b/usr.bin/tip/libacu/t3000.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: t3000.c,v 1.14 2006/03/17 19:17:13 moritz Exp $	*/
 /*	$NetBSD: t3000.c,v 1.5 1997/02/11 09:24:18 mrg Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/libacu/v3451.c b/usr.bin/tip/libacu/v3451.c
index 0de679e..3fe6c21 100644
--- a/usr.bin/tip/libacu/v3451.c
+++ b/usr.bin/tip/libacu/v3451.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: v3451.c,v 1.9 2006/03/17 19:17:13 moritz Exp $	*/
 /*	$NetBSD: v3451.c,v 1.6 1997/02/11 09:24:20 mrg Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/libacu/v831.c b/usr.bin/tip/libacu/v831.c
index 7adc3c6..6066638 100644
--- a/usr.bin/tip/libacu/v831.c
+++ b/usr.bin/tip/libacu/v831.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: v831.c,v 1.11 2006/03/17 19:17:13 moritz Exp $	*/
 /*	$NetBSD: v831.c,v 1.5 1996/12/29 10:42:01 cgd Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index 399b5d8..df08662 100644
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: ventel.c,v 1.12 2006/03/17 19:17:13 moritz Exp $	*/
 /*	$NetBSD: ventel.c,v 1.6 1997/02/11 09:24:21 mrg Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index 5d2cda6..d24e7f7 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: acu.c,v 1.12 2006/03/17 14:43:06 moritz Exp $	*/
 /*	$NetBSD: acu.c,v 1.4 1996/12/29 10:34:03 cgd Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index 5f64968..49f1b4a 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: acutab.c,v 1.5 2006/03/17 19:17:13 moritz Exp $	*/
 /*	$NetBSD: acutab.c,v 1.3 1994/12/08 09:30:41 jtc Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index 50cedc4..6676ae3 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: cmds.c,v 1.26 2006/06/06 23:24:52 deraadt Exp $	*/
 /*	$NetBSD: cmds.c,v 1.7 1997/02/11 09:24:03 mrg Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/cmdtab.c b/usr.bin/tip/tip/cmdtab.c
index 3666c12..d8c1231 100644
--- a/usr.bin/tip/tip/cmdtab.c
+++ b/usr.bin/tip/tip/cmdtab.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: cmdtab.c,v 1.7 2006/03/17 14:43:06 moritz Exp $	*/
 /*	$NetBSD: cmdtab.c,v 1.3 1994/12/08 09:30:46 jtc Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index d8d104d..6c888d1 100644
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: cu.c,v 1.19 2006/05/25 08:41:52 jmc Exp $	*/
 /*	$NetBSD: cu.c,v 1.5 1997/02/11 09:24:05 mrg Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index 0c104f1..2f6711d 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: hunt.c,v 1.13 2006/03/17 19:39:46 deraadt Exp $	*/
 /*	$NetBSD: hunt.c,v 1.6 1997/04/20 00:02:10 mellon Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c
index 8123795..aeb324a 100644
--- a/usr.bin/tip/tip/log.c
+++ b/usr.bin/tip/tip/log.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: log.c,v 1.8 2006/03/16 19:32:46 deraadt Exp $	*/
 /*	$NetBSD: log.c,v 1.4 1994/12/24 17:56:28 cgd Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/partab.c b/usr.bin/tip/tip/partab.c
index 05bb329..f2d6c31 100644
--- a/usr.bin/tip/tip/partab.c
+++ b/usr.bin/tip/tip/partab.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: partab.c,v 1.5 2003/06/03 02:56:18 millert Exp $	*/
 /*	$NetBSD: partab.c,v 1.4 1996/12/29 10:38:21 cgd Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/pathnames.h b/usr.bin/tip/tip/pathnames.h
index 66a453d..a42aed3 100644
--- a/usr.bin/tip/tip/pathnames.h
+++ b/usr.bin/tip/tip/pathnames.h
@@ -2,7 +2,9 @@
 /*	$NetBSD: pathnames.h,v 1.3 1994/12/08 09:30:59 jtc Exp $	*/
 /*	$FreeBSD$	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index d9993ae..1fe03be 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: remote.c,v 1.16 2006/06/06 23:24:52 deraadt Exp $	*/
 /*	$NetBSD: remote.c,v 1.5 1997/04/20 00:02:45 mellon Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index 066d679..a65ad61 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: tip.c,v 1.30 2006/08/18 03:06:18 jason Exp $	*/
 /*	$NetBSD: tip.c,v 1.13 1997/04/20 00:03:05 mellon Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/tip.h b/usr.bin/tip/tip/tip.h
index 7e7faa6..041ba8a 100644
--- a/usr.bin/tip/tip/tip.h
+++ b/usr.bin/tip/tip/tip.h
@@ -2,7 +2,9 @@
 /*	$NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $	*/
 /*	$FreeBSD$	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index db6afe4..8018229 100644
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: tipout.c,v 1.18 2006/05/31 07:03:08 jason Exp $	*/
 /*	$NetBSD: tipout.c,v 1.5 1996/12/29 10:34:12 cgd Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/uucplock.c b/usr.bin/tip/tip/uucplock.c
index c82ea78..da16015 100644
--- a/usr.bin/tip/tip/uucplock.c
+++ b/usr.bin/tip/tip/uucplock.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: uucplock.c,v 1.11 2006/03/16 19:32:46 deraadt Exp $	*/
 /*	$NetBSD: uucplock.c,v 1.7 1997/02/11 09:24:08 mrg Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index b6cf5c2..a4776b8 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: value.c,v 1.14 2006/03/17 22:02:58 moritz Exp $	*/
 /*	$NetBSD: value.c,v 1.6 1997/02/11 09:24:09 mrg Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tip/tip/vars.c b/usr.bin/tip/tip/vars.c
index a991bcc..a412264 100644
--- a/usr.bin/tip/tip/vars.c
+++ b/usr.bin/tip/tip/vars.c
@@ -1,7 +1,9 @@
 /*	$OpenBSD: vars.c,v 1.8 2006/08/18 03:06:18 jason Exp $	*/
 /*	$NetBSD: vars.c,v 1.3 1994/12/08 09:31:19 jtc Exp $	*/
 
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index 804af7e..6db429b 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tput/clear.sh b/usr.bin/tput/clear.sh
index 4b3531c..c441d6f 100644
--- a/usr.bin/tput/clear.sh
+++ b/usr.bin/tput/clear.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -
 #
+# SPDX-License-Identifier: BSD-3-Clause
+#
 # Copyright (c) 1989, 1993
 #	The Regents of the University of California.  All rights reserved.
 #
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index 0c66d62..8cd27e4 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tr/extern.h b/usr.bin/tr/extern.h
index 8b68f44..81f9e80 100644
--- a/usr.bin/tr/extern.h
+++ b/usr.bin/tr/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index 333ca5c..a8b2fd6 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index d54e74c..f80fb7f 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.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.
  *
diff --git a/usr.bin/true/true.c b/usr.bin/true/true.c
index a557f58..1a93713 100644
--- a/usr.bin/true/true.c
+++ b/usr.bin/true/true.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.
  *
diff --git a/usr.bin/truss/amd64-freebsd.c b/usr.bin/truss/amd64-freebsd.c
index 7e2ed16..e83e916 100644
--- a/usr.bin/truss/amd64-freebsd.c
+++ b/usr.bin/truss/amd64-freebsd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/amd64-freebsd32.c b/usr.bin/truss/amd64-freebsd32.c
index 66ca417..ffb76e4 100644
--- a/usr.bin/truss/amd64-freebsd32.c
+++ b/usr.bin/truss/amd64-freebsd32.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/amd64-linux.c b/usr.bin/truss/amd64-linux.c
index 00eb06f..ead3880 100644
--- a/usr.bin/truss/amd64-linux.c
+++ b/usr.bin/truss/amd64-linux.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c
index 70e201a..69344e9 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/arm-freebsd.c b/usr.bin/truss/arm-freebsd.c
index 7538290..683ece5 100644
--- a/usr.bin/truss/arm-freebsd.c
+++ b/usr.bin/truss/arm-freebsd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/extern.h b/usr.bin/truss/extern.h
index f19a1cb..dd160a7 100644
--- a/usr.bin/truss/extern.h
+++ b/usr.bin/truss/extern.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/i386-freebsd.c b/usr.bin/truss/i386-freebsd.c
index 8103ca7..b222958 100644
--- a/usr.bin/truss/i386-freebsd.c
+++ b/usr.bin/truss/i386-freebsd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index e96db16..77185d1 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 052546a..9ba7968 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/mips-freebsd.c b/usr.bin/truss/mips-freebsd.c
index e3f2a04..cade9d6 100644
--- a/usr.bin/truss/mips-freebsd.c
+++ b/usr.bin/truss/mips-freebsd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright 1998 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index 97dd965..092188a 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/sparc64-freebsd.c b/usr.bin/truss/sparc64-freebsd.c
index d1ae896..d9a5597 100644
--- a/usr.bin/truss/sparc64-freebsd.c
+++ b/usr.bin/truss/sparc64-freebsd.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright 1998 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index e5f858f..eebcc32 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/tset/extern.h b/usr.bin/tset/extern.h
index f4a6514..597190d 100644
--- a/usr.bin/tset/extern.h
+++ b/usr.bin/tset/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c
index 715f514..a6753ae 100644
--- a/usr.bin/tset/map.c
+++ b/usr.bin/tset/map.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c
index 52298e5..372e324 100644
--- a/usr.bin/tset/misc.c
+++ b/usr.bin/tset/misc.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index c48a6e7..adff6a6 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c
index 106c98f..b3998af 100644
--- a/usr.bin/tset/term.c
+++ b/usr.bin/tset/term.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index 0196a2d..e69d3fa 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c
index 77751fa..231189b 100644
--- a/usr.bin/tset/wrterm.c
+++ b/usr.bin/tset/wrterm.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index 1511b36..961ef35 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index 450722a..a0c3be1 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.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.
  *
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index e6df880..14b1d87 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index cf61622..c3bf573 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 2002 Juli Mallett.
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index dcbd7fb..51d1128 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index be0ff08..1c9a314 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index 2be5078..fd82ddd 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index e5af907..9c5a223 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h
index 812592f..4924e55 100644
--- a/usr.bin/vgrind/extern.h
+++ b/usr.bin/vgrind/extern.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/vgrind/pathnames.h b/usr.bin/vgrind/pathnames.h
index 825a06a..0eb6ec1 100644
--- a/usr.bin/vgrind/pathnames.h
+++ b/usr.bin/vgrind/pathnames.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index 994cd2b..5a9d9fa 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index ec0b4e0..05e3e9e 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/vgrind/vgrind.sh b/usr.bin/vgrind/vgrind.sh
index c01f24d..1779bbd 100644
--- a/usr.bin/vgrind/vgrind.sh
+++ b/usr.bin/vgrind/vgrind.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
+# SPDX-License-Identifier: BSD-3-Clause
+#
 # Copyright (c) 1980, 1993
 #	The Regents of the University of California.  All rights reserved.
 #
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 33ce3ad..80323b3 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1986, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/w/extern.h b/usr.bin/w/extern.h
index facc3e8..366ee81 100644
--- a/usr.bin/w/extern.h
+++ b/usr.bin/w/extern.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 123f6c4..e1bc3e3 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index 0e73ba4..1bf093e 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 20aca78..70005fc 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 1317a4b..0b8383d 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index b3a63dc..9c07dd1 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1988, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index a6ca137..ec04d94 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1987, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index c72e3fa..66d7dbd 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 4f4062b..d8541e7 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index 2008fd2..33d1e79 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/xargs/pathnames.h b/usr.bin/xargs/pathnames.h
index 25c6043..fb8ab10 100644
--- a/usr.bin/xargs/pathnames.h
+++ b/usr.bin/xargs/pathnames.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 955711c..5b90a83 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 16eba77..15fc2ef 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2012, 2013 SRI International
  * Copyright (c) 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/xstr/pathnames.h b/usr.bin/xstr/pathnames.h
index 63f633e..3ee2af8 100644
--- a/usr.bin/xstr/pathnames.h
+++ b/usr.bin/xstr/pathnames.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 4aad8e6..1351418 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c
index ef98b4d..9965813 100644
--- a/usr.bin/yes/yes.c
+++ b/usr.bin/yes/yes.c
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
-- 
cgit v1.1