[master] 508ae8bc1 Add SPDX license identifiers to all files with a Copyright notice.

[Poul-Henning Kamp]

commit 508ae8bc149d3ad338d227a04ddc030e2045105b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jan 27 11:19:09 2020 +0000

    Add SPDX license identifiers to all files with a Copyright notice.

diff --git a/LICENSE b/LICENSE
index 1fc73b8bf..db1cc57f8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,12 @@
+The compilation of software known as "Varnish Cache" is distributed
+under the following terms:
+
 Copyright (c) 2006 Verdens Gang AS
 Copyright (c) 2006-2016 Varnish Software AS
 All rights reserved.
 
+SPDX-License-Identifier: BSD-2-Clause
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index cd72a536a..71c82d2a3 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -5,6 +5,8 @@
  *
  * Author: Cecilie Fritzvold <cecilihf at linpro.no>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/builtin.vcl b/bin/varnishd/builtin.vcl
index a7e23f49a..329323c90 100644
--- a/bin/varnishd/builtin.vcl
+++ b/bin/varnishd/builtin.vcl
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 14f5338c4..ecf14cf41 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 36eddcca7..b40987e00 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 31767b4a1..81ab3c5fa 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index c46e10365..9262c5290 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_backend_probe.c b/bin/varnishd/cache/cache_backend_probe.c
index 3339b722c..252ae7ecb 100644
--- a/bin/varnishd/cache/cache_backend_probe.c
+++ b/bin/varnishd/cache/cache_backend_probe.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_ban.c b/bin/varnishd/cache/cache_ban.c
index 354e9fc08..03a912d9e 100644
--- a/bin/varnishd/cache/cache_ban.c
+++ b/bin/varnishd/cache/cache_ban.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_ban.h b/bin/varnishd/cache/cache_ban.h
index 4288f1297..1302c17be 100644
--- a/bin/varnishd/cache/cache_ban.h
+++ b/bin/varnishd/cache/cache_ban.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_ban_build.c b/bin/varnishd/cache/cache_ban_build.c
index 55fcc4bb1..e8c768ee5 100644
--- a/bin/varnishd/cache/cache_ban_build.c
+++ b/bin/varnishd/cache/cache_ban_build.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_ban_lurker.c b/bin/varnishd/cache/cache_ban_lurker.c
index 4d0453807..cc18eccb8 100644
--- a/bin/varnishd/cache/cache_ban_lurker.c
+++ b/bin/varnishd/cache/cache_ban_lurker.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_busyobj.c b/bin/varnishd/cache/cache_busyobj.c
index 98b7f9a74..1e77272c0 100644
--- a/bin/varnishd/cache/cache_busyobj.c
+++ b/bin/varnishd/cache/cache_busyobj.c
@@ -5,6 +5,8 @@
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_cli.c b/bin/varnishd/cache/cache_cli.c
index b38387d67..85a16a724 100644
--- a/bin/varnishd/cache/cache_cli.c
+++ b/bin/varnishd/cache/cache_cli.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_deliver_proc.c b/bin/varnishd/cache/cache_deliver_proc.c
index 1bd65a66c..b7a316733 100644
--- a/bin/varnishd/cache/cache_deliver_proc.c
+++ b/bin/varnishd/cache/cache_deliver_proc.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index 192347f3d..b0adeb172 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_director.h b/bin/varnishd/cache/cache_director.h
index 7c0442513..e164e1678 100644
--- a/bin/varnishd/cache/cache_director.h
+++ b/bin/varnishd/cache/cache_director.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_esi.h b/bin/varnishd/cache/cache_esi.h
index 454e595fb..1e5777b50 100644
--- a/bin/varnishd/cache/cache_esi.h
+++ b/bin/varnishd/cache/cache_esi.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 6e6ca7a8f..301d8f6ed 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_esi_fetch.c b/bin/varnishd/cache/cache_esi_fetch.c
index e301ab705..74b430173 100644
--- a/bin/varnishd/cache/cache_esi_fetch.c
+++ b/bin/varnishd/cache/cache_esi_fetch.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_esi_parse.c b/bin/varnishd/cache/cache_esi_parse.c
index ed67f0e5f..2cd1f85c8 100644
--- a/bin/varnishd/cache/cache_esi_parse.c
+++ b/bin/varnishd/cache/cache_esi_parse.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index c55bfec91..2ed544dc2 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 7a2e57b37..9f94a546d 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_fetch_proc.c b/bin/varnishd/cache/cache_fetch_proc.c
index e92c8a685..1e0b766a2 100644
--- a/bin/varnishd/cache/cache_fetch_proc.c
+++ b/bin/varnishd/cache/cache_fetch_proc.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_filter.h b/bin/varnishd/cache/cache_filter.h
index 57415e1af..4d0c7640d 100644
--- a/bin/varnishd/cache/cache_filter.h
+++ b/bin/varnishd/cache/cache_filter.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index 33d7e7ae1..27e6c9926 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c
index 692f0961f..51d2f972f 100644
--- a/bin/varnishd/cache/cache_hash.c
+++ b/bin/varnishd/cache/cache_hash.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 5bf32db7b..fad9b236b 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_lck.c b/bin/varnishd/cache/cache_lck.c
index c0bb98bb3..7af1a5712 100644
--- a/bin/varnishd/cache/cache_lck.c
+++ b/bin/varnishd/cache/cache_lck.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index d6618876d..a62cb83f6 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_mempool.c b/bin/varnishd/cache/cache_mempool.c
index 9add62d3c..abd5d5daa 100644
--- a/bin/varnishd/cache/cache_mempool.c
+++ b/bin/varnishd/cache/cache_mempool.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_obj.c b/bin/varnishd/cache/cache_obj.c
index b533eefcf..ef10c10b7 100644
--- a/bin/varnishd/cache/cache_obj.c
+++ b/bin/varnishd/cache/cache_obj.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_obj.h b/bin/varnishd/cache/cache_obj.h
index 5229b7e00..5208afa0c 100644
--- a/bin/varnishd/cache/cache_obj.h
+++ b/bin/varnishd/cache/cache_obj.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_objhead.h b/bin/varnishd/cache/cache_objhead.h
index 286859223..bc1782379 100644
--- a/bin/varnishd/cache/cache_objhead.h
+++ b/bin/varnishd/cache/cache_objhead.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index ce0d163fb..d5031b131 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -5,6 +5,8 @@
  *
  * Author: Dag-Erling Smørgrav <des at des.no>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 58846b4e9..c5991c634 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_pool.h b/bin/varnishd/cache/cache_pool.h
index b4b5890c5..04a026e61 100644
--- a/bin/varnishd/cache/cache_pool.h
+++ b/bin/varnishd/cache/cache_pool.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_range.c b/bin/varnishd/cache/cache_range.c
index 6370c0951..c1f8bd344 100644
--- a/bin/varnishd/cache/cache_range.c
+++ b/bin/varnishd/cache/cache_range.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_req.c b/bin/varnishd/cache/cache_req.c
index 0363bf72e..61c0182e8 100644
--- a/bin/varnishd/cache/cache_req.c
+++ b/bin/varnishd/cache/cache_req.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_req_body.c b/bin/varnishd/cache/cache_req_body.c
index 011b5c511..2987a2bb2 100644
--- a/bin/varnishd/cache/cache_req_body.c
+++ b/bin/varnishd/cache/cache_req_body.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index f4067c1d8..7cff23876 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_rfc2616.c b/bin/varnishd/cache/cache_rfc2616.c
index a870ba05c..77f30f92c 100644
--- a/bin/varnishd/cache/cache_rfc2616.c
+++ b/bin/varnishd/cache/cache_rfc2616.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 1be9f1fff..1ba60742f 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_shmlog.c b/bin/varnishd/cache/cache_shmlog.c
index 4eb9ed30b..9590d284f 100644
--- a/bin/varnishd/cache/cache_shmlog.c
+++ b/bin/varnishd/cache/cache_shmlog.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_tcp_pool.c b/bin/varnishd/cache/cache_tcp_pool.c
index a20e04ef6..d4451e5b7 100644
--- a/bin/varnishd/cache/cache_tcp_pool.c
+++ b/bin/varnishd/cache/cache_tcp_pool.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_tcp_pool.h b/bin/varnishd/cache/cache_tcp_pool.h
index d7608da85..91bbc642a 100644
--- a/bin/varnishd/cache/cache_tcp_pool.h
+++ b/bin/varnishd/cache/cache_tcp_pool.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_transport.h b/bin/varnishd/cache/cache_transport.h
index 2551665b5..9d8f9dfc5 100644
--- a/bin/varnishd/cache/cache_transport.h
+++ b/bin/varnishd/cache/cache_transport.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_varnishd.h b/bin/varnishd/cache/cache_varnishd.h
index 8e8e50664..73c758f23 100644
--- a/bin/varnishd/cache/cache_varnishd.h
+++ b/bin/varnishd/cache/cache_varnishd.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_vary.c b/bin/varnishd/cache/cache_vary.c
index 4af92f69c..3dc23e33f 100644
--- a/bin/varnishd/cache/cache_vary.c
+++ b/bin/varnishd/cache/cache_vary.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 4a6a0605d..66b8ff775 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_vcl.h b/bin/varnishd/cache/cache_vcl.h
index 2c4c18016..1864367ce 100644
--- a/bin/varnishd/cache/cache_vcl.h
+++ b/bin/varnishd/cache/cache_vcl.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_vgz.h b/bin/varnishd/cache/cache_vgz.h
index 6f977c1aa..af5e08933 100644
--- a/bin/varnishd/cache/cache_vgz.h
+++ b/bin/varnishd/cache/cache_vgz.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_vpi.c b/bin/varnishd/cache/cache_vpi.c
index b80f4be04..298cac7a9 100644
--- a/bin/varnishd/cache/cache_vpi.c
+++ b/bin/varnishd/cache/cache_vpi.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index ef5a135cd..f224b9ffd 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_vrt_filter.c b/bin/varnishd/cache/cache_vrt_filter.c
index 2f75dfda0..b6444d886 100644
--- a/bin/varnishd/cache/cache_vrt_filter.c
+++ b/bin/varnishd/cache/cache_vrt_filter.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_vrt_priv.c b/bin/varnishd/cache/cache_vrt_priv.c
index b20660436..6493698b7 100644
--- a/bin/varnishd/cache/cache_vrt_priv.c
+++ b/bin/varnishd/cache/cache_vrt_priv.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_vrt_re.c b/bin/varnishd/cache/cache_vrt_re.c
index ad1f44de8..955fb1c2b 100644
--- a/bin/varnishd/cache/cache_vrt_re.c
+++ b/bin/varnishd/cache/cache_vrt_re.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index ab650b6ad..d7cb5f794 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_vrt_vcl.c b/bin/varnishd/cache/cache_vrt_vcl.c
index d1eb561b8..2da13502f 100644
--- a/bin/varnishd/cache/cache_vrt_vcl.c
+++ b/bin/varnishd/cache/cache_vrt_vcl.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_vrt_vmod.c b/bin/varnishd/cache/cache_vrt_vmod.c
index 5a5fd1d24..6456b1657 100644
--- a/bin/varnishd/cache/cache_vrt_vmod.c
+++ b/bin/varnishd/cache/cache_vrt_vmod.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index 15558adf7..d7fb95530 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/cache/cache_ws.c b/bin/varnishd/cache/cache_ws.c
index 61fc5b3fa..2ea57116a 100644
--- a/bin/varnishd/cache/cache_ws.c
+++ b/bin/varnishd/cache/cache_ws.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/common/common_param.h b/bin/varnishd/common/common_param.h
index 13ce0cb18..d9e2b8437 100644
--- a/bin/varnishd/common/common_param.h
+++ b/bin/varnishd/common/common_param.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/common/common_vsc.c b/bin/varnishd/common/common_vsc.c
index ea1d0049c..94cb465cd 100644
--- a/bin/varnishd/common/common_vsc.c
+++ b/bin/varnishd/common/common_vsc.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/common/common_vsmw.c b/bin/varnishd/common/common_vsmw.c
index 71ced508f..383d90c36 100644
--- a/bin/varnishd/common/common_vsmw.c
+++ b/bin/varnishd/common/common_vsmw.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/common/heritage.h b/bin/varnishd/common/heritage.h
index db1dd37d6..e3550ada6 100644
--- a/bin/varnishd/common/heritage.h
+++ b/bin/varnishd/common/heritage.h
@@ -6,6 +6,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/common/vsmw.h b/bin/varnishd/common/vsmw.h
index 4d4e35974..07d46b19e 100644
--- a/bin/varnishd/common/vsmw.h
+++ b/bin/varnishd/common/vsmw.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/fuzzers/esi_parse_fuzzer.c b/bin/varnishd/fuzzers/esi_parse_fuzzer.c
index 34548b90f..0a1b9cc76 100644
--- a/bin/varnishd/fuzzers/esi_parse_fuzzer.c
+++ b/bin/varnishd/fuzzers/esi_parse_fuzzer.c
@@ -4,6 +4,8 @@
  *
  * Author: Federico G. Schwindt <fgsch at lodoss.net>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/hash/hash_classic.c b/bin/varnishd/hash/hash_classic.c
index cb3b0b3a2..71c5e7564 100644
--- a/bin/varnishd/hash/hash_classic.c
+++ b/bin/varnishd/hash/hash_classic.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/hash/hash_critbit.c b/bin/varnishd/hash/hash_critbit.c
index 1f1a36c1a..2c9d6b4f3 100644
--- a/bin/varnishd/hash/hash_critbit.c
+++ b/bin/varnishd/hash/hash_critbit.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/hash/hash_simple_list.c b/bin/varnishd/hash/hash_simple_list.c
index 8c0858e18..68d7dc26d 100644
--- a/bin/varnishd/hash/hash_simple_list.c
+++ b/bin/varnishd/hash/hash_simple_list.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/hash/hash_slinger.h b/bin/varnishd/hash/hash_slinger.h
index 0ff95cca2..66d4c2639 100644
--- a/bin/varnishd/hash/hash_slinger.h
+++ b/bin/varnishd/hash/hash_slinger.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/hash/mgt_hash.c b/bin/varnishd/hash/mgt_hash.c
index fc715c081..2964177ba 100644
--- a/bin/varnishd/hash/mgt_hash.c
+++ b/bin/varnishd/hash/mgt_hash.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/hpack/vhp.h b/bin/varnishd/hpack/vhp.h
index ae67136a1..f89dd981a 100644
--- a/bin/varnishd/hpack/vhp.h
+++ b/bin/varnishd/hpack/vhp.h
@@ -4,6 +4,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/hpack/vhp_decode.c b/bin/varnishd/hpack/vhp_decode.c
index fa1e65231..d18f30b13 100644
--- a/bin/varnishd/hpack/vhp_decode.c
+++ b/bin/varnishd/hpack/vhp_decode.c
@@ -5,6 +5,8 @@
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  * Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/hpack/vhp_gen_hufdec.c b/bin/varnishd/hpack/vhp_gen_hufdec.c
index da0593a94..679251efe 100644
--- a/bin/varnishd/hpack/vhp_gen_hufdec.c
+++ b/bin/varnishd/hpack/vhp_gen_hufdec.c
@@ -4,6 +4,8 @@
  *
  * Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/hpack/vhp_table.c b/bin/varnishd/hpack/vhp_table.c
index 3ac29969e..4d8a6b7fa 100644
--- a/bin/varnishd/hpack/vhp_table.c
+++ b/bin/varnishd/hpack/vhp_table.c
@@ -4,6 +4,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http1/cache_http1.h b/bin/varnishd/http1/cache_http1.h
index 9d83a782a..4e66938bb 100644
--- a/bin/varnishd/http1/cache_http1.h
+++ b/bin/varnishd/http1/cache_http1.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http1/cache_http1_deliver.c b/bin/varnishd/http1/cache_http1_deliver.c
index 2714a0410..f5f2c9579 100644
--- a/bin/varnishd/http1/cache_http1_deliver.c
+++ b/bin/varnishd/http1/cache_http1_deliver.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http1/cache_http1_fetch.c b/bin/varnishd/http1/cache_http1_fetch.c
index 30d03d469..50edabb83 100644
--- a/bin/varnishd/http1/cache_http1_fetch.c
+++ b/bin/varnishd/http1/cache_http1_fetch.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http1/cache_http1_fsm.c b/bin/varnishd/http1/cache_http1_fsm.c
index 63c7833c9..4668c5f8c 100644
--- a/bin/varnishd/http1/cache_http1_fsm.c
+++ b/bin/varnishd/http1/cache_http1_fsm.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http1/cache_http1_line.c b/bin/varnishd/http1/cache_http1_line.c
index 5ea8335e0..88ff2ffd9 100644
--- a/bin/varnishd/http1/cache_http1_line.c
+++ b/bin/varnishd/http1/cache_http1_line.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http1/cache_http1_pipe.c b/bin/varnishd/http1/cache_http1_pipe.c
index 420005641..2ddaf7f44 100644
--- a/bin/varnishd/http1/cache_http1_pipe.c
+++ b/bin/varnishd/http1/cache_http1_pipe.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http1/cache_http1_proto.c b/bin/varnishd/http1/cache_http1_proto.c
index 7fe4422db..935e70e47 100644
--- a/bin/varnishd/http1/cache_http1_proto.c
+++ b/bin/varnishd/http1/cache_http1_proto.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http1/cache_http1_vfp.c b/bin/varnishd/http1/cache_http1_vfp.c
index a6cda3caf..30d879ec2 100644
--- a/bin/varnishd/http1/cache_http1_vfp.c
+++ b/bin/varnishd/http1/cache_http1_vfp.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http2/cache_http2.h b/bin/varnishd/http2/cache_http2.h
index 4c263ce04..270306d15 100644
--- a/bin/varnishd/http2/cache_http2.h
+++ b/bin/varnishd/http2/cache_http2.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http2/cache_http2_deliver.c b/bin/varnishd/http2/cache_http2_deliver.c
index 529042e33..c279ec54f 100644
--- a/bin/varnishd/http2/cache_http2_deliver.c
+++ b/bin/varnishd/http2/cache_http2_deliver.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http2/cache_http2_hpack.c b/bin/varnishd/http2/cache_http2_hpack.c
index 0b4b3f78d..e00473452 100644
--- a/bin/varnishd/http2/cache_http2_hpack.c
+++ b/bin/varnishd/http2/cache_http2_hpack.c
@@ -4,6 +4,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http2/cache_http2_panic.c b/bin/varnishd/http2/cache_http2_panic.c
index 122e43d83..ddc4eb761 100644
--- a/bin/varnishd/http2/cache_http2_panic.c
+++ b/bin/varnishd/http2/cache_http2_panic.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index 9290cc0f8..e90dfa87f 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http2/cache_http2_send.c b/bin/varnishd/http2/cache_http2_send.c
index 37f052d26..a684b9488 100644
--- a/bin/varnishd/http2/cache_http2_send.c
+++ b/bin/varnishd/http2/cache_http2_send.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/http2/cache_http2_session.c b/bin/varnishd/http2/cache_http2_session.c
index 8480692f0..618f26b33 100644
--- a/bin/varnishd/http2/cache_http2_session.c
+++ b/bin/varnishd/http2/cache_http2_session.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
index 82c34b52a..7daf52b60 100644
--- a/bin/varnishd/mgt/mgt.h
+++ b/bin/varnishd/mgt/mgt.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_acceptor.c b/bin/varnishd/mgt/mgt_acceptor.c
index 7f1207c63..1d513bc31 100644
--- a/bin/varnishd/mgt/mgt_acceptor.c
+++ b/bin/varnishd/mgt/mgt_acceptor.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index da85d048b..f2d90e52e 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index 4de0db5d9..8cf182bac 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_jail.c b/bin/varnishd/mgt/mgt_jail.c
index a46a366f8..60515d28f 100644
--- a/bin/varnishd/mgt/mgt_jail.c
+++ b/bin/varnishd/mgt/mgt_jail.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_jail_solaris.c b/bin/varnishd/mgt/mgt_jail_solaris.c
index dda89efae..961ce1e8e 100644
--- a/bin/varnishd/mgt/mgt_jail_solaris.c
+++ b/bin/varnishd/mgt/mgt_jail_solaris.c
@@ -6,6 +6,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *	   Nils Goroll <nils.goroll at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_jail_unix.c b/bin/varnishd/mgt/mgt_jail_unix.c
index cc3aeb199..b34fc04e8 100644
--- a/bin/varnishd/mgt/mgt_jail_unix.c
+++ b/bin/varnishd/mgt/mgt_jail_unix.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 77e2039a5..4753ef69b 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 4eaecfae5..1ce83dee6 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_param.h b/bin/varnishd/mgt/mgt_param.h
index c1e799874..98d47f77d 100644
--- a/bin/varnishd/mgt/mgt_param.h
+++ b/bin/varnishd/mgt/mgt_param.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_param_bits.c b/bin/varnishd/mgt/mgt_param_bits.c
index 279994a73..14adeba6d 100644
--- a/bin/varnishd/mgt/mgt_param_bits.c
+++ b/bin/varnishd/mgt/mgt_param_bits.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_param_tbl.c b/bin/varnishd/mgt/mgt_param_tbl.c
index fe1ee507f..adb448a91 100644
--- a/bin/varnishd/mgt/mgt_param_tbl.c
+++ b/bin/varnishd/mgt/mgt_param_tbl.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_param_tcp.c b/bin/varnishd/mgt/mgt_param_tcp.c
index ef555337b..087800a0f 100644
--- a/bin/varnishd/mgt/mgt_param_tcp.c
+++ b/bin/varnishd/mgt/mgt_param_tcp.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_param_tweak.c b/bin/varnishd/mgt/mgt_param_tweak.c
index 78f95d3ff..a947fd52b 100644
--- a/bin/varnishd/mgt/mgt_param_tweak.c
+++ b/bin/varnishd/mgt/mgt_param_tweak.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_pool.c b/bin/varnishd/mgt/mgt_pool.c
index 3d7201380..dc8b847c8 100644
--- a/bin/varnishd/mgt/mgt_pool.c
+++ b/bin/varnishd/mgt/mgt_pool.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_shmem.c b/bin/varnishd/mgt/mgt_shmem.c
index 574513413..439c9d42c 100644
--- a/bin/varnishd/mgt/mgt_shmem.c
+++ b/bin/varnishd/mgt/mgt_shmem.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_symtab.c b/bin/varnishd/mgt/mgt_symtab.c
index b8ef07d3a..d4666328a 100644
--- a/bin/varnishd/mgt/mgt_symtab.c
+++ b/bin/varnishd/mgt/mgt_symtab.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_util.c b/bin/varnishd/mgt/mgt_util.c
index de31fdadd..889fdc69b 100644
--- a/bin/varnishd/mgt/mgt_util.c
+++ b/bin/varnishd/mgt/mgt_util.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_vcc.c b/bin/varnishd/mgt/mgt_vcc.c
index 86d9a354d..8f742e16c 100644
--- a/bin/varnishd/mgt/mgt_vcc.c
+++ b/bin/varnishd/mgt/mgt_vcc.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_vcl.c b/bin/varnishd/mgt/mgt_vcl.c
index cc372d2b8..c15d3879d 100644
--- a/bin/varnishd/mgt/mgt_vcl.c
+++ b/bin/varnishd/mgt/mgt_vcl.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/mgt/mgt_vcl.h b/bin/varnishd/mgt/mgt_vcl.h
index 7f55c5a45..6f3b7d4bf 100644
--- a/bin/varnishd/mgt/mgt_vcl.h
+++ b/bin/varnishd/mgt/mgt_vcl.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/proxy/cache_proxy.h b/bin/varnishd/proxy/cache_proxy.h
index 97c11deaf..6fdfe6078 100644
--- a/bin/varnishd/proxy/cache_proxy.h
+++ b/bin/varnishd/proxy/cache_proxy.h
@@ -4,6 +4,8 @@
  *
  * Author: Emmanuel Hocdet <manu at gandi.net>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/proxy/cache_proxy_proto.c b/bin/varnishd/proxy/cache_proxy_proto.c
index fb24fafdc..7efe6cc2f 100644
--- a/bin/varnishd/proxy/cache_proxy_proto.c
+++ b/bin/varnishd/proxy/cache_proxy_proto.c
@@ -6,6 +6,8 @@
  * Authors: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *          Emmanuel Hocdet <manu at gandi.net>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/mgt_stevedore.c b/bin/varnishd/storage/mgt_stevedore.c
index 7e16dbc8a..24cc27fdb 100644
--- a/bin/varnishd/storage/mgt_stevedore.c
+++ b/bin/varnishd/storage/mgt_stevedore.c
@@ -4,6 +4,8 @@
  *
  * Author: Dag-Erling Smørgav <des at des.no>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/mgt_storage_persistent.c b/bin/varnishd/storage/mgt_storage_persistent.c
index 40d5d7233..372dfb953 100644
--- a/bin/varnishd/storage/mgt_storage_persistent.c
+++ b/bin/varnishd/storage/mgt_storage_persistent.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/stevedore.c b/bin/varnishd/storage/stevedore.c
index 0f33bd656..93d3f78d4 100644
--- a/bin/varnishd/storage/stevedore.c
+++ b/bin/varnishd/storage/stevedore.c
@@ -4,6 +4,8 @@
  *
  * Author: Dag-Erling Smørgav <des at des.no>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/stevedore_utils.c b/bin/varnishd/storage/stevedore_utils.c
index 99207e469..e46b5485e 100644
--- a/bin/varnishd/storage/stevedore_utils.c
+++ b/bin/varnishd/storage/stevedore_utils.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/storage.h b/bin/varnishd/storage/storage.h
index 0db48e3de..32bd1a2fa 100644
--- a/bin/varnishd/storage/storage.h
+++ b/bin/varnishd/storage/storage.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/storage_file.c b/bin/varnishd/storage/storage_file.c
index 7e0c0a2ae..52422e3bc 100644
--- a/bin/varnishd/storage/storage_file.c
+++ b/bin/varnishd/storage/storage_file.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/storage_lru.c b/bin/varnishd/storage/storage_lru.c
index 381612bb8..e14782e56 100644
--- a/bin/varnishd/storage/storage_lru.c
+++ b/bin/varnishd/storage/storage_lru.c
@@ -4,6 +4,8 @@
  *
  * Author: Dag-Erling Smørgav <des at des.no>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/storage_malloc.c b/bin/varnishd/storage/storage_malloc.c
index b8a168af8..b04f7bf64 100644
--- a/bin/varnishd/storage/storage_malloc.c
+++ b/bin/varnishd/storage/storage_malloc.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/storage_persistent.c b/bin/varnishd/storage/storage_persistent.c
index 3125c8d35..dc494c5f5 100644
--- a/bin/varnishd/storage/storage_persistent.c
+++ b/bin/varnishd/storage/storage_persistent.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/storage_persistent.h b/bin/varnishd/storage/storage_persistent.h
index 48fe8c0c5..0f8aafbed 100644
--- a/bin/varnishd/storage/storage_persistent.h
+++ b/bin/varnishd/storage/storage_persistent.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/storage_persistent_silo.c b/bin/varnishd/storage/storage_persistent_silo.c
index aa3831582..95d3864d0 100644
--- a/bin/varnishd/storage/storage_persistent_silo.c
+++ b/bin/varnishd/storage/storage_persistent_silo.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/storage_persistent_subr.c b/bin/varnishd/storage/storage_persistent_subr.c
index 32144f374..8a1ba8808 100644
--- a/bin/varnishd/storage/storage_persistent_subr.c
+++ b/bin/varnishd/storage/storage_persistent_subr.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/storage_simple.c b/bin/varnishd/storage/storage_simple.c
index 962756cdd..231a50d6b 100644
--- a/bin/varnishd/storage/storage_simple.c
+++ b/bin/varnishd/storage/storage_simple.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/storage_simple.h b/bin/varnishd/storage/storage_simple.h
index 6985cdd8c..4e63efb9d 100644
--- a/bin/varnishd/storage/storage_simple.h
+++ b/bin/varnishd/storage/storage_simple.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/storage/storage_umem.c b/bin/varnishd/storage/storage_umem.c
index dc53a1d60..db45305f6 100644
--- a/bin/varnishd/storage/storage_umem.c
+++ b/bin/varnishd/storage/storage_umem.c
@@ -7,6 +7,8 @@
  * Authors: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *	    Nils Goroll <nils.goroll at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/waiter/cache_waiter.c b/bin/varnishd/waiter/cache_waiter.c
index 80a0deb9f..79de2cdef 100644
--- a/bin/varnishd/waiter/cache_waiter.c
+++ b/bin/varnishd/waiter/cache_waiter.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index f7dcc7c3f..53fa4be3b 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -5,6 +5,8 @@
  *
  * Author: Rogerio Carvalho Schneider <stockrt at gmail.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index 8a50c260c..33429b19b 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/waiter/cache_waiter_poll.c b/bin/varnishd/waiter/cache_waiter_poll.c
index 57f7bbcd2..ea77af96c 100644
--- a/bin/varnishd/waiter/cache_waiter_poll.c
+++ b/bin/varnishd/waiter/cache_waiter_poll.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index dc5e82805..4120586f9 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -6,6 +6,8 @@
  * Copyright (c) 2010-2016 UPLEX, Nils Goroll
  * All rights reserved.
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/waiter/mgt_waiter.c b/bin/varnishd/waiter/mgt_waiter.c
index 1ea8320f2..4dab32a10 100644
--- a/bin/varnishd/waiter/mgt_waiter.c
+++ b/bin/varnishd/waiter/mgt_waiter.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/waiter/mgt_waiter.h b/bin/varnishd/waiter/mgt_waiter.h
index d8f622247..5b93f8eab 100644
--- a/bin/varnishd/waiter/mgt_waiter.h
+++ b/bin/varnishd/waiter/mgt_waiter.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/waiter/waiter.h b/bin/varnishd/waiter/waiter.h
index cbdf6a6d6..912f76669 100644
--- a/bin/varnishd/waiter/waiter.h
+++ b/bin/varnishd/waiter/waiter.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishd/waiter/waiter_priv.h b/bin/varnishd/waiter/waiter_priv.h
index 8ef498613..ce8f93b4e 100644
--- a/bin/varnishd/waiter/waiter_priv.h
+++ b/bin/varnishd/waiter/waiter_priv.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index 8f5dd795d..4f19de3f0 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -7,6 +7,8 @@
  * Author: Dag-Erling Smørgrav <des at des.no>
  * Author: Guillaume Quintard <guillaume.quintard at gmail.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishhist/varnishhist_options.h b/bin/varnishhist/varnishhist_options.h
index 44d710da4..28d2fc4c7 100644
--- a/bin/varnishhist/varnishhist_options.h
+++ b/bin/varnishhist/varnishhist_options.h
@@ -4,6 +4,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishhist/varnishhist_profiles.h b/bin/varnishhist/varnishhist_profiles.h
index a7295b670..6619f06d1 100644
--- a/bin/varnishhist/varnishhist_profiles.h
+++ b/bin/varnishhist/varnishhist_profiles.h
@@ -4,6 +4,8 @@
  *
  * Author: Nils Goroll <nils.goroll at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishlog/varnishlog.c b/bin/varnishlog/varnishlog.c
index 003528b46..d9c5170f3 100644
--- a/bin/varnishlog/varnishlog.c
+++ b/bin/varnishlog/varnishlog.c
@@ -6,6 +6,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishlog/varnishlog_options.h b/bin/varnishlog/varnishlog_options.h
index 8c9fd1db7..85394c204 100644
--- a/bin/varnishlog/varnishlog_options.h
+++ b/bin/varnishlog/varnishlog_options.h
@@ -5,6 +5,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishncsa/b64.h b/bin/varnishncsa/b64.h
index 526ae1986..6b0aab35b 100644
--- a/bin/varnishncsa/b64.h
+++ b/bin/varnishncsa/b64.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index 0dc640237..657d4a5fc 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -8,6 +8,8 @@
  * Author: Tollef Fog Heen <tfheen at varnish-software.com>
  * Author: Martin Blix Grydeland <mbgrydeland at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishncsa/varnishncsa_options.h b/bin/varnishncsa/varnishncsa_options.h
index 896b33da0..fb9ab474d 100644
--- a/bin/varnishncsa/varnishncsa_options.h
+++ b/bin/varnishncsa/varnishncsa_options.h
@@ -4,6 +4,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index 6906499e5..6247f5035 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -6,6 +6,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  * Author: Dag-Erling Smørgrav <des at des.no>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishstat/varnishstat.h b/bin/varnishstat/varnishstat.h
index 00099ea02..4b0377864 100644
--- a/bin/varnishstat/varnishstat.h
+++ b/bin/varnishstat/varnishstat.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishstat/varnishstat_bindings.h b/bin/varnishstat/varnishstat_bindings.h
index f90ade1fa..7d8cbc2ba 100644
--- a/bin/varnishstat/varnishstat_bindings.h
+++ b/bin/varnishstat/varnishstat_bindings.h
@@ -4,6 +4,8 @@
  *
  * Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishstat/varnishstat_curses.c b/bin/varnishstat/varnishstat_curses.c
index 5ca5e279e..f61612fb6 100644
--- a/bin/varnishstat/varnishstat_curses.c
+++ b/bin/varnishstat/varnishstat_curses.c
@@ -7,6 +7,8 @@
  * Author: Dag-Erling Smørgrav <des at des.no>
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishstat/varnishstat_options.h b/bin/varnishstat/varnishstat_options.h
index a1ea33b2d..73cba2a99 100644
--- a/bin/varnishstat/varnishstat_options.h
+++ b/bin/varnishstat/varnishstat_options.h
@@ -4,6 +4,8 @@
  *
  * Author: Federico G. Schwindt <fgsch at lodoss.net>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/cmds.h b/bin/varnishtest/cmds.h
index 8eb2fa4f1..17a64408c 100644
--- a/bin/varnishtest/cmds.h
+++ b/bin/varnishtest/cmds.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/gensequences b/bin/varnishtest/gensequences
index 18a68b43b..59f137977 100644
--- a/bin/varnishtest/gensequences
+++ b/bin/varnishtest/gensequences
@@ -4,6 +4,8 @@
 # Copyright (c) 2008-2009 Ed Schouten <ed at FreeBSD.org>
 # All rights reserved.
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/bin/varnishtest/hpack.h b/bin/varnishtest/hpack.h
index b1ad007bb..c9d55977b 100644
--- a/bin/varnishtest/hpack.h
+++ b/bin/varnishtest/hpack.h
@@ -4,6 +4,8 @@
  *
  * Author: Guillaume Quintard <guillaume.quintard at gmail.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/programs.h b/bin/varnishtest/programs.h
index f8875ce31..05c4f136d 100644
--- a/bin/varnishtest/programs.h
+++ b/bin/varnishtest/programs.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/sequences b/bin/varnishtest/sequences
index 50f589626..cf49a4961 100644
--- a/bin/varnishtest/sequences
+++ b/bin/varnishtest/sequences
@@ -2,6 +2,8 @@
 # Copyright (c) 2008-2009 Ed Schouten <ed at FreeBSD.org>
 # All rights reserved.
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/bin/varnishtest/teken.3 b/bin/varnishtest/teken.3
index c1ece8554..840a17cec 100644
--- a/bin/varnishtest/teken.3
+++ b/bin/varnishtest/teken.3
@@ -1,6 +1,8 @@
 .\" Copyright (c) 2011 Ed Schouten <ed at FreeBSD.org>
 .\" All rights reserved.
 .\"
+.\" SPDX-License-Identifier: BSD-2-Clause
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
diff --git a/bin/varnishtest/vmods.h b/bin/varnishtest/vmods.h
index 06ab9b80c..2af7644d9 100644
--- a/bin/varnishtest/vmods.h
+++ b/bin/varnishtest/vmods.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index be6c85aa1..88c0eba11 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc.h b/bin/varnishtest/vtc.h
index ab218abce..2300288d4 100644
--- a/bin/varnishtest/vtc.h
+++ b/bin/varnishtest/vtc.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_barrier.c b/bin/varnishtest/vtc_barrier.c
index 99ed617d5..3b04026fc 100644
--- a/bin/varnishtest/vtc_barrier.c
+++ b/bin/varnishtest/vtc_barrier.c
@@ -4,6 +4,8 @@
  *
  * Author: Dridi Boukelmoune <dridi at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_client.c b/bin/varnishtest/vtc_client.c
index 639e80a6d..c0a532e47 100644
--- a/bin/varnishtest/vtc_client.c
+++ b/bin/varnishtest/vtc_client.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_gzip.c b/bin/varnishtest/vtc_gzip.c
index ab42c68c6..2f9043a9c 100644
--- a/bin/varnishtest/vtc_gzip.c
+++ b/bin/varnishtest/vtc_gzip.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_h2_hpack.c b/bin/varnishtest/vtc_h2_hpack.c
index e16361c9f..64b5d0360 100644
--- a/bin/varnishtest/vtc_h2_hpack.c
+++ b/bin/varnishtest/vtc_h2_hpack.c
@@ -4,6 +4,8 @@
  *
  * Author: Guillaume Quintard <guillaume.quintard at gmail.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_h2_priv.h b/bin/varnishtest/vtc_h2_priv.h
index 5c646d3ed..683d020b3 100644
--- a/bin/varnishtest/vtc_h2_priv.h
+++ b/bin/varnishtest/vtc_h2_priv.h
@@ -4,6 +4,8 @@
  *
  * Author: Guillaume Quintard <guillaume.quintard at gmail.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_h2_tbl.c b/bin/varnishtest/vtc_h2_tbl.c
index 0aaa35289..5a5234254 100644
--- a/bin/varnishtest/vtc_h2_tbl.c
+++ b/bin/varnishtest/vtc_h2_tbl.c
@@ -4,6 +4,8 @@
  *
  * Author: Guillaume Quintard <guillaume.quintard at gmail.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_haproxy.c b/bin/varnishtest/vtc_haproxy.c
index 72e9d3438..80fb8b827 100644
--- a/bin/varnishtest/vtc_haproxy.c
+++ b/bin/varnishtest/vtc_haproxy.c
@@ -4,6 +4,8 @@
  *
  * Author: Frédéric Lécaille <flecaille at haproxy.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index b062773e2..382a55c5a 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_http.h b/bin/varnishtest/vtc_http.h
index 0e6337839..d1690a4a3 100644
--- a/bin/varnishtest/vtc_http.h
+++ b/bin/varnishtest/vtc_http.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index 9d9a4e5f6..ab78ed162 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -4,6 +4,8 @@
  *
  * Author: Guillaume Quintard <guillaume.quintard at gmail.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_log.c b/bin/varnishtest/vtc_log.c
index be67a5d9c..645a5f11a 100644
--- a/bin/varnishtest/vtc_log.c
+++ b/bin/varnishtest/vtc_log.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_logexp.c b/bin/varnishtest/vtc_logexp.c
index 31a9cb450..4719ad034 100644
--- a/bin/varnishtest/vtc_logexp.c
+++ b/bin/varnishtest/vtc_logexp.c
@@ -4,6 +4,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index 46335e6e2..b0cc128b2 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_misc.c b/bin/varnishtest/vtc_misc.c
index 1bd6b88a8..dd0cd2e6f 100644
--- a/bin/varnishtest/vtc_misc.c
+++ b/bin/varnishtest/vtc_misc.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index 39911afaa..99c68cc0c 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -4,6 +4,8 @@
  *
  * Author: Dridi Boukelmoune <dridi at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_proxy.c b/bin/varnishtest/vtc_proxy.c
index ffa322e85..7a3fd7ac7 100644
--- a/bin/varnishtest/vtc_proxy.c
+++ b/bin/varnishtest/vtc_proxy.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_server.c b/bin/varnishtest/vtc_server.c
index 3ff49705e..9ed58d923 100644
--- a/bin/varnishtest/vtc_server.c
+++ b/bin/varnishtest/vtc_server.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_subr.c b/bin/varnishtest/vtc_subr.c
index 3cf36d586..1d549ab60 100644
--- a/bin/varnishtest/vtc_subr.c
+++ b/bin/varnishtest/vtc_subr.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_syslog.c b/bin/varnishtest/vtc_syslog.c
index d4f7dbc15..c388ac8e6 100644
--- a/bin/varnishtest/vtc_syslog.c
+++ b/bin/varnishtest/vtc_syslog.c
@@ -4,6 +4,8 @@
  *
  * Author: Frédéric Lécaille <flecaille at haproxy.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index bbc80899c..1ec748cb6 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtop/varnishtop.c b/bin/varnishtop/varnishtop.c
index 070b71bd7..de64c7519 100644
--- a/bin/varnishtop/varnishtop.c
+++ b/bin/varnishtop/varnishtop.c
@@ -7,6 +7,8 @@
  * Author: Dag-Erling Smørgrav <des at des.no>
  * Author: Guillaume Quintard <guillaume.quintard at gmail.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bin/varnishtop/varnishtop_options.h b/bin/varnishtop/varnishtop_options.h
index 2a6c312e7..7070a4618 100644
--- a/bin/varnishtop/varnishtop_options.h
+++ b/bin/varnishtop/varnishtop_options.h
@@ -4,6 +4,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/doc/sphinx/vtc-syntax.py b/doc/sphinx/vtc-syntax.py
index 42205797c..03451ce51 100644
--- a/doc/sphinx/vtc-syntax.py
+++ b/doc/sphinx/vtc-syntax.py
@@ -5,6 +5,8 @@
 #
 # Author: Guillaume Quintard <guillaume.quintard at gmail.com>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/etc/devicedetect.vcl b/etc/devicedetect.vcl
index cabc16a45..006cc6843 100644
--- a/etc/devicedetect.vcl
+++ b/etc/devicedetect.vcl
@@ -2,6 +2,8 @@
 # Copyright (c) 2016-2018 Varnish Cache project
 # Copyright (c) 2012-2016 Varnish Software AS
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/include/binary_heap.h b/include/binary_heap.h
index 7cef493dd..da2b27133 100644
--- a/include/binary_heap.h
+++ b/include/binary_heap.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/compat/daemon.h b/include/compat/daemon.h
index 3f987f675..6f335e992 100644
--- a/include/compat/daemon.h
+++ b/include/compat/daemon.h
@@ -5,6 +5,8 @@
  *
  * Author: Dag-Erling Smørgrav <des at des.no>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/generate.py b/include/generate.py
index 6d1377661..20bdd8130 100755
--- a/include/generate.py
+++ b/include/generate.py
@@ -6,6 +6,8 @@
 #
 # Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/include/libvcc.h b/include/libvcc.h
index 10ed6f04d..3bf2d1ea1 100644
--- a/include/libvcc.h
+++ b/include/libvcc.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/acct_fields_bereq.h b/include/tbl/acct_fields_bereq.h
index b1063257c..15b307e34 100644
--- a/include/tbl/acct_fields_bereq.h
+++ b/include/tbl/acct_fields_bereq.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/acct_fields_req.h b/include/tbl/acct_fields_req.h
index 3921ab2e4..1b8a0b0c9 100644
--- a/include/tbl/acct_fields_req.h
+++ b/include/tbl/acct_fields_req.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/backend_poll.h b/include/tbl/backend_poll.h
index 5c1e2078f..1d1cdbadf 100644
--- a/include/tbl/backend_poll.h
+++ b/include/tbl/backend_poll.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/ban_arg_oper.h b/include/tbl/ban_arg_oper.h
index df372c2aa..d139e08a6 100644
--- a/include/tbl/ban_arg_oper.h
+++ b/include/tbl/ban_arg_oper.h
@@ -4,6 +4,8 @@
  *
  * Author: Nils Goroll <nils.goroll at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * 1. Redistributions of source code must retain the above copyright notice,
diff --git a/include/tbl/ban_oper.h b/include/tbl/ban_oper.h
index 06430c1f3..cd4103e61 100644
--- a/include/tbl/ban_oper.h
+++ b/include/tbl/ban_oper.h
@@ -4,6 +4,8 @@
  *
  * Author: Nils Goroll <nils.goroll at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * 1. Redistributions of source code must retain the above copyright notice,
diff --git a/include/tbl/ban_vars.h b/include/tbl/ban_vars.h
index db7ff2ef7..015cef817 100644
--- a/include/tbl/ban_vars.h
+++ b/include/tbl/ban_vars.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/bo_flags.h b/include/tbl/bo_flags.h
index 88b8eebe3..91293f5d6 100644
--- a/include/tbl/bo_flags.h
+++ b/include/tbl/bo_flags.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/boc_state.h b/include/tbl/boc_state.h
index a5c4a61ff..44984de81 100644
--- a/include/tbl/boc_state.h
+++ b/include/tbl/boc_state.h
@@ -4,6 +4,8 @@
  *
  * Author: Federico G. Schwindt <fgsch at lodoss.net>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/body_status.h b/include/tbl/body_status.h
index c1718318b..4ab48f1a3 100644
--- a/include/tbl/body_status.h
+++ b/include/tbl/body_status.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/cli_cmds.h b/include/tbl/cli_cmds.h
index 7ad0817d8..41c0569a1 100644
--- a/include/tbl/cli_cmds.h
+++ b/include/tbl/cli_cmds.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/debug_bits.h b/include/tbl/debug_bits.h
index f76eb76ec..6002cecd9 100644
--- a/include/tbl/debug_bits.h
+++ b/include/tbl/debug_bits.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/feature_bits.h b/include/tbl/feature_bits.h
index 23f1b01f8..042240f3c 100644
--- a/include/tbl/feature_bits.h
+++ b/include/tbl/feature_bits.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/h2_error.h b/include/tbl/h2_error.h
index 02044db6f..88b2337e7 100644
--- a/include/tbl/h2_error.h
+++ b/include/tbl/h2_error.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/h2_frames.h b/include/tbl/h2_frames.h
index 825908217..805613b19 100644
--- a/include/tbl/h2_frames.h
+++ b/include/tbl/h2_frames.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/h2_settings.h b/include/tbl/h2_settings.h
index c382e862d..6c4520711 100644
--- a/include/tbl/h2_settings.h
+++ b/include/tbl/h2_settings.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/h2_stream.h b/include/tbl/h2_stream.h
index 21f6b3de2..171fec968 100644
--- a/include/tbl/h2_stream.h
+++ b/include/tbl/h2_stream.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/htc.h b/include/tbl/htc.h
index 4e9695491..911e2bfca 100644
--- a/include/tbl/htc.h
+++ b/include/tbl/htc.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/http_headers.h b/include/tbl/http_headers.h
index 44e7d0656..5ce6b673a 100644
--- a/include/tbl/http_headers.h
+++ b/include/tbl/http_headers.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/http_response.h b/include/tbl/http_response.h
index 0e21d00d6..8f2314639 100644
--- a/include/tbl/http_response.h
+++ b/include/tbl/http_response.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/locks.h b/include/tbl/locks.h
index cf2a6ed06..c3852dad8 100644
--- a/include/tbl/locks.h
+++ b/include/tbl/locks.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/obj_attr.h b/include/tbl/obj_attr.h
index a695c1efa..65c3ac0cc 100644
--- a/include/tbl/obj_attr.h
+++ b/include/tbl/obj_attr.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/oc_exp_flags.h b/include/tbl/oc_exp_flags.h
index 83160b064..926ab5d8e 100644
--- a/include/tbl/oc_exp_flags.h
+++ b/include/tbl/oc_exp_flags.h
@@ -4,6 +4,8 @@
  *
  * Author: Federico G. Schwindt <fgsch at lodoss.net>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/oc_flags.h b/include/tbl/oc_flags.h
index 84fd86f80..6bde9d19e 100644
--- a/include/tbl/oc_flags.h
+++ b/include/tbl/oc_flags.h
@@ -4,6 +4,8 @@
  *
  * Author: Federico G. Schwindt <fgsch at lodoss.net>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/params.h b/include/tbl/params.h
index ccb416eb0..a37f60bcb 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/req_body.h b/include/tbl/req_body.h
index 5b4716a13..9effc0707 100644
--- a/include/tbl/req_body.h
+++ b/include/tbl/req_body.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/req_flags.h b/include/tbl/req_flags.h
index 2c0dbe803..2e826601c 100644
--- a/include/tbl/req_flags.h
+++ b/include/tbl/req_flags.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/sess_attr.h b/include/tbl/sess_attr.h
index 7702e463a..5c0122a80 100644
--- a/include/tbl/sess_attr.h
+++ b/include/tbl/sess_attr.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/sess_close.h b/include/tbl/sess_close.h
index c20e71ca6..61d8f3b99 100644
--- a/include/tbl/sess_close.h
+++ b/include/tbl/sess_close.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/steps.h b/include/tbl/steps.h
index 12deb9cd7..7fa119557 100644
--- a/include/tbl/steps.h
+++ b/include/tbl/steps.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/symbol_kind.h b/include/tbl/symbol_kind.h
index 8c0294373..40dfbfdd8 100644
--- a/include/tbl/symbol_kind.h
+++ b/include/tbl/symbol_kind.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/vhd_fsm.h b/include/tbl/vhd_fsm.h
index 4d0e66075..ec7258706 100644
--- a/include/tbl/vhd_fsm.h
+++ b/include/tbl/vhd_fsm.h
@@ -4,6 +4,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/vhd_fsm_funcs.h b/include/tbl/vhd_fsm_funcs.h
index f8bb45928..e3f80f462 100644
--- a/include/tbl/vhd_fsm_funcs.h
+++ b/include/tbl/vhd_fsm_funcs.h
@@ -4,6 +4,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/vhd_return.h b/include/tbl/vhd_return.h
index 66547d4b7..aab5212fd 100644
--- a/include/tbl/vhd_return.h
+++ b/include/tbl/vhd_return.h
@@ -4,6 +4,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/vsc_levels.h b/include/tbl/vsc_levels.h
index f85dd2a70..c043bc5b8 100644
--- a/include/tbl/vsc_levels.h
+++ b/include/tbl/vsc_levels.h
@@ -5,6 +5,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/vsig_list.h b/include/tbl/vsig_list.h
index f7a05d60c..e9a8c08a0 100644
--- a/include/tbl/vsig_list.h
+++ b/include/tbl/vsig_list.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h
index cf3a20e2c..ad51c1e04 100644
--- a/include/tbl/vsl_tags.h
+++ b/include/tbl/vsl_tags.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/vsl_tags_http.h b/include/tbl/vsl_tags_http.h
index 249e35c98..7a0198da6 100644
--- a/include/tbl/vsl_tags_http.h
+++ b/include/tbl/vsl_tags_http.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/tbl/waiters.h b/include/tbl/waiters.h
index f2fcf6446..cee56bdf4 100644
--- a/include/tbl/waiters.h
+++ b/include/tbl/waiters.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vapi/vapi_options.h b/include/vapi/vapi_options.h
index a357abd28..419a71302 100644
--- a/include/vapi/vapi_options.h
+++ b/include/vapi/vapi_options.h
@@ -5,6 +5,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vapi/voptget.h b/include/vapi/voptget.h
index 51de7c683..902599e03 100644
--- a/include/vapi/voptget.h
+++ b/include/vapi/voptget.h
@@ -5,6 +5,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vapi/vsc.h b/include/vapi/vsc.h
index 6976c857b..b2ba993e9 100644
--- a/include/vapi/vsc.h
+++ b/include/vapi/vsc.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vapi/vsig.h b/include/vapi/vsig.h
index 1556ae779..810b37dce 100644
--- a/include/vapi/vsig.h
+++ b/include/vapi/vsig.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vapi/vsl.h b/include/vapi/vsl.h
index 8a8872acb..7d75ef772 100644
--- a/include/vapi/vsl.h
+++ b/include/vapi/vsl.h
@@ -6,6 +6,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vapi/vsl_int.h b/include/vapi/vsl_int.h
index 589a96637..d4b9fe54e 100644
--- a/include/vapi/vsl_int.h
+++ b/include/vapi/vsl_int.h
@@ -6,6 +6,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vapi/vsm.h b/include/vapi/vsm.h
index a852e4c77..81a613d3d 100644
--- a/include/vapi/vsm.h
+++ b/include/vapi/vsm.h
@@ -6,6 +6,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vas.h b/include/vas.h
index bd51d9211..a73b6d927 100644
--- a/include/vas.h
+++ b/include/vas.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vav.h b/include/vav.h
index a3861cf40..c94cee902 100644
--- a/include/vav.h
+++ b/include/vav.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vbm.h b/include/vbm.h
index 9dcc3d0fb..4f0486cf1 100644
--- a/include/vbm.h
+++ b/include/vbm.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vbm_test.c b/include/vbm_test.c
index f68059720..bf55a6a30 100644
--- a/include/vbm_test.c
+++ b/include/vbm_test.c
@@ -4,6 +4,8 @@
  *
  * Author: Nils Goroll <nils.goroll at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vcc_interface.h b/include/vcc_interface.h
index 37cc04aac..9d9f46d6d 100644
--- a/include/vcc_interface.h
+++ b/include/vcc_interface.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vcli.h b/include/vcli.h
index f147ef07b..51e1e55f7 100644
--- a/include/vcli.h
+++ b/include/vcli.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vcli_serve.h b/include/vcli_serve.h
index 71beae3a1..f3757f28b 100644
--- a/include/vcli_serve.h
+++ b/include/vcli_serve.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vcs.h b/include/vcs.h
index 8e605eb97..489316299 100644
--- a/include/vcs.h
+++ b/include/vcs.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vct.h b/include/vct.h
index 40425296a..34aca2536 100644
--- a/include/vct.h
+++ b/include/vct.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vcurses.h b/include/vcurses.h
index 911cf969c..1bd756661 100644
--- a/include/vcurses.h
+++ b/include/vcurses.h
@@ -2,6 +2,8 @@
  * Copyright (c) 2014 Varnish Software AS
  * All rights reserved.
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vdef.h b/include/vdef.h
index 250ff2bfe..0a60716b0 100644
--- a/include/vdef.h
+++ b/include/vdef.h
@@ -9,6 +9,8 @@
  *
  * Inspired by FreeBSD's <sys/cdefs.h>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vend.h b/include/vend.h
index 7bd5aaa5a..8a701b86e 100644
--- a/include/vend.h
+++ b/include/vend.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2003,2010 Poul-Henning Kamp <phk at freebsd.org>
  * All rights reserved.
  *
diff --git a/include/vev.h b/include/vev.h
index edd90141a..197c14882 100644
--- a/include/vev.h
+++ b/include/vev.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vfil.h b/include/vfil.h
index 49369f57e..1f72c2305 100644
--- a/include/vfil.h
+++ b/include/vfil.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vfl.h b/include/vfl.h
index 6cf926526..99bc55b41 100644
--- a/include/vfl.h
+++ b/include/vfl.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2007 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *
diff --git a/include/vin.h b/include/vin.h
index c594980c5..373dda0e1 100644
--- a/include/vin.h
+++ b/include/vin.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vjsn.h b/include/vjsn.h
index 5051a6cfa..274c23b12 100644
--- a/include/vjsn.h
+++ b/include/vjsn.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vlu.h b/include/vlu.h
index 8ce98dd3f..12d55a057 100644
--- a/include/vlu.h
+++ b/include/vlu.h
@@ -2,6 +2,8 @@
  * Copyright (c) 2005-2008 Poul-Henning Kamp <phk at freebsd.org>
  * All rights reserved.
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vmb.h b/include/vmb.h
index 9c148fbf7..9aaa7e949 100644
--- a/include/vmb.h
+++ b/include/vmb.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vnum.h b/include/vnum.h
index 53da2a8e3..93f797e72 100644
--- a/include/vnum.h
+++ b/include/vnum.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vpf.h b/include/vpf.h
index 51afaf36f..68e256baa 100644
--- a/include/vpf.h
+++ b/include/vpf.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 2005 Pawel Jakub Dawidek <pjd at FreeBSD.org>
  * All rights reserved.
  *
diff --git a/include/vqueue.h b/include/vqueue.h
index 3bbb7a170..58dcb41ce 100644
--- a/include/vqueue.h
+++ b/include/vqueue.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/include/vre.h b/include/vre.h
index 8062a3a01..b139c8a06 100644
--- a/include/vre.h
+++ b/include/vre.h
@@ -4,6 +4,8 @@
  *
  * Author: Tollef Fog Heen <tfheen at redpill-linpro.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vrnd.h b/include/vrnd.h
index a828af86b..248fc6eac 100644
--- a/include/vrnd.h
+++ b/include/vrnd.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at FreeBSD.org>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vrt.h b/include/vrt.h
index 979d5b3d9..8d06bb7b5 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vsa.h b/include/vsa.h
index 2e4f0da91..e44544d55 100644
--- a/include/vsa.h
+++ b/include/vsa.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vsb.h b/include/vsb.h
index 47d66ac2e..806719b70 100644
--- a/include/vsb.h
+++ b/include/vsb.h
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2000-2011 Poul-Henning Kamp
  * Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
diff --git a/include/vsc_priv.h b/include/vsc_priv.h
index 88f55dd3d..110e618d2 100644
--- a/include/vsc_priv.h
+++ b/include/vsc_priv.h
@@ -5,6 +5,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vsha256.h b/include/vsha256.h
index 8f20505fc..546e8a2c9 100644
--- a/include/vsha256.h
+++ b/include/vsha256.h
@@ -2,6 +2,8 @@
  * Copyright 2005 Colin Percival
  * All rights reserved.
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vsl_priv.h b/include/vsl_priv.h
index 434550fd7..73e98ffdd 100644
--- a/include/vsl_priv.h
+++ b/include/vsl_priv.h
@@ -6,6 +6,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vsm_priv.h b/include/vsm_priv.h
index 9bb327109..f0751683e 100644
--- a/include/vsm_priv.h
+++ b/include/vsm_priv.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vss.h b/include/vss.h
index bf1fb2b6d..4695743b2 100644
--- a/include/vss.h
+++ b/include/vss.h
@@ -3,6 +3,8 @@
  * Copyright (c) 2006-2009 Varnish Software AS
  * All rights reserved.
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vsub.h b/include/vsub.h
index de62908ec..711185afb 100644
--- a/include/vsub.h
+++ b/include/vsub.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vtcp.h b/include/vtcp.h
index a5431aba6..05244f74b 100644
--- a/include/vtcp.h
+++ b/include/vtcp.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vtim.h b/include/vtim.h
index 3eab38d69..d69a6130d 100644
--- a/include/vtim.h
+++ b/include/vtim.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vtree.h b/include/vtree.h
index 4f53c7551..647917690 100644
--- a/include/vtree.h
+++ b/include/vtree.h
@@ -3,6 +3,8 @@
 /* $FreeBSD: release/9.0.0/sys/sys/tree.h 189204 2009-03-01 04:57:23Z bms $ */
 
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright 2002 Niels Provos <provos at citi.umich.edu>
  * All rights reserved.
  *
diff --git a/include/vus.h b/include/vus.h
index ddaf33199..ce4c53494 100644
--- a/include/vus.h
+++ b/include/vus.h
@@ -4,6 +4,8 @@
  *
  * Author: Geoffrey Simmons <geoffrey.simmons at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vut.h b/include/vut.h
index 8a35b0267..275a85ea4 100644
--- a/include/vut.h
+++ b/include/vut.h
@@ -5,6 +5,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/include/vut_options.h b/include/vut_options.h
index 7aacaaaec..ad9e59a71 100644
--- a/include/vut_options.h
+++ b/include/vut_options.h
@@ -5,6 +5,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index fee40c93c..0079efe1d 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vas.c b/lib/libvarnish/vas.c
index 3a9193268..13161bcea 100644
--- a/lib/libvarnish/vas.c
+++ b/lib/libvarnish/vas.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vav.c b/lib/libvarnish/vav.c
index f1bc3db10..12fb4d6f5 100644
--- a/lib/libvarnish/vav.c
+++ b/lib/libvarnish/vav.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vcli_proto.c b/lib/libvarnish/vcli_proto.c
index d914f0879..d7eef5d88 100644
--- a/lib/libvarnish/vcli_proto.c
+++ b/lib/libvarnish/vcli_proto.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index b97611978..2fc7dfe5b 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vct.c b/lib/libvarnish/vct.c
index 2bb540687..cbc6da20a 100644
--- a/lib/libvarnish/vct.c
+++ b/lib/libvarnish/vct.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/version.c b/lib/libvarnish/version.c
index db3398f22..d2e344f7e 100644
--- a/lib/libvarnish/version.c
+++ b/lib/libvarnish/version.c
@@ -5,6 +5,8 @@
  *
  * Author: Dag-Erling Smørgrav <des at des.no>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vev.c b/lib/libvarnish/vev.c
index dcace04f4..ac8fd4d4f 100644
--- a/lib/libvarnish/vev.c
+++ b/lib/libvarnish/vev.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vfil.c b/lib/libvarnish/vfil.c
index ad41c5644..0720e7f74 100644
--- a/lib/libvarnish/vfil.c
+++ b/lib/libvarnish/vfil.c
@@ -5,6 +5,8 @@
  *
  * Author: Dag-Erling Smørgrav <des at des.no>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vin.c b/lib/libvarnish/vin.c
index 053e9ed36..8f8d616dd 100644
--- a/lib/libvarnish/vin.c
+++ b/lib/libvarnish/vin.c
@@ -4,6 +4,8 @@
  *
  * Author: Dag-Erling Smørgrav <des at des.no>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vjsn.c b/lib/libvarnish/vjsn.c
index d9c1a1e53..2a52bd874 100644
--- a/lib/libvarnish/vjsn.c
+++ b/lib/libvarnish/vjsn.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vlu.c b/lib/libvarnish/vlu.c
index 7b4eb90db..3c32a87a0 100644
--- a/lib/libvarnish/vlu.c
+++ b/lib/libvarnish/vlu.c
@@ -2,6 +2,8 @@
  * Copyright (c) 2005-2008 Poul-Henning Kamp <phk at freebsd.org>
  * All rights reserved.
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vmb.c b/lib/libvarnish/vmb.c
index af860240d..8105e0224 100644
--- a/lib/libvarnish/vmb.c
+++ b/lib/libvarnish/vmb.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vnum.c b/lib/libvarnish/vnum.c
index 7533158ac..4e0d004f0 100644
--- a/lib/libvarnish/vnum.c
+++ b/lib/libvarnish/vnum.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vpf.c b/lib/libvarnish/vpf.c
index ce406a0dc..ef6cf27cf 100644
--- a/lib/libvarnish/vpf.c
+++ b/lib/libvarnish/vpf.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2005 Pawel Jakub Dawidek <pjd at FreeBSD.org>
  * All rights reserved.
  *
diff --git a/lib/libvarnish/vre.c b/lib/libvarnish/vre.c
index 42047aafe..7ef62da8d 100644
--- a/lib/libvarnish/vre.c
+++ b/lib/libvarnish/vre.c
@@ -4,6 +4,8 @@
  *
  * Author: Tollef Fog Heen <tfheen at redpill-linpro.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vrnd.c b/lib/libvarnish/vrnd.c
index 13557b0e7..778c31fb2 100644
--- a/lib/libvarnish/vrnd.c
+++ b/lib/libvarnish/vrnd.c
@@ -6,6 +6,8 @@
  *
  * Author: Dag-Erling Smørgrav <des at des.no>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vsa.c b/lib/libvarnish/vsa.c
index 438126ccc..cd8dd4f72 100644
--- a/lib/libvarnish/vsa.c
+++ b/lib/libvarnish/vsa.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vsb.c b/lib/libvarnish/vsb.c
index 66fc7b1ed..0762c175e 100644
--- a/lib/libvarnish/vsb.c
+++ b/lib/libvarnish/vsb.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vsha256.c b/lib/libvarnish/vsha256.c
index 73efb0b2b..5f16fe342 100644
--- a/lib/libvarnish/vsha256.c
+++ b/lib/libvarnish/vsha256.c
@@ -2,6 +2,8 @@
  * Copyright 2005 Colin Percival
  * All rights reserved.
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vss.c b/lib/libvarnish/vss.c
index 10281eee6..24056c4da 100644
--- a/lib/libvarnish/vss.c
+++ b/lib/libvarnish/vss.c
@@ -6,6 +6,8 @@
  * Author: Dag-Erling Smørgrav <des at des.no>
  * Author: Cecilie Fritzvold <cecilihf at linpro.no>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vsub.c b/lib/libvarnish/vsub.c
index 515169d82..eade83bac 100644
--- a/lib/libvarnish/vsub.c
+++ b/lib/libvarnish/vsub.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vtcp.c b/lib/libvarnish/vtcp.c
index 763db1ee6..bdd5d4e53 100644
--- a/lib/libvarnish/vtcp.c
+++ b/lib/libvarnish/vtcp.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vte.c b/lib/libvarnish/vte.c
index fa6be82be..119dd9880 100644
--- a/lib/libvarnish/vte.c
+++ b/lib/libvarnish/vte.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vtim.c b/lib/libvarnish/vtim.c
index ddc0201a6..5b91fc970 100644
--- a/lib/libvarnish/vtim.c
+++ b/lib/libvarnish/vtim.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnish/vus.c b/lib/libvarnish/vus.c
index 200679fc0..d36bb8784 100644
--- a/lib/libvarnish/vus.c
+++ b/lib/libvarnish/vus.c
@@ -4,6 +4,8 @@
  *
  * Author: Geoffrey Simmons <geoffrey.simmons at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/daemon.c b/lib/libvarnishapi/daemon.c
index 180f3370a..d7ca0026e 100644
--- a/lib/libvarnishapi/daemon.c
+++ b/lib/libvarnishapi/daemon.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/lib/libvarnishapi/generate.py b/lib/libvarnishapi/generate.py
index e411957d6..3924e4a13 100755
--- a/lib/libvarnishapi/generate.py
+++ b/lib/libvarnishapi/generate.py
@@ -7,6 +7,8 @@
 # Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
 # Author: Martin Blix Grydeland <martin at varnish-software.com>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/lib/libvarnishapi/libvarnishapi.map b/lib/libvarnishapi/libvarnishapi.map
index 17f982ddd..4c0acb133 100644
--- a/lib/libvarnishapi/libvarnishapi.map
+++ b/lib/libvarnishapi/libvarnishapi.map
@@ -4,6 +4,8 @@
  *
  * Author: Tollef Fog Heen <tfheen at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index a59a861c8..6846e19f3 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -6,6 +6,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vsig.c b/lib/libvarnishapi/vsig.c
index 924973e3c..2237eeec6 100644
--- a/lib/libvarnishapi/vsig.c
+++ b/lib/libvarnishapi/vsig.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vsl.c b/lib/libvarnishapi/vsl.c
index 2c3c160fd..761cc4402 100644
--- a/lib/libvarnishapi/vsl.c
+++ b/lib/libvarnishapi/vsl.c
@@ -6,6 +6,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vsl2rst.c b/lib/libvarnishapi/vsl2rst.c
index ea9866e71..947edd4e6 100644
--- a/lib/libvarnishapi/vsl2rst.c
+++ b/lib/libvarnishapi/vsl2rst.c
@@ -4,6 +4,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vsl_api.h b/lib/libvarnishapi/vsl_api.h
index 8817aa8fe..600ee994f 100644
--- a/lib/libvarnishapi/vsl_api.h
+++ b/lib/libvarnishapi/vsl_api.h
@@ -6,6 +6,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vsl_arg.c b/lib/libvarnishapi/vsl_arg.c
index c72d5a1a9..25e811424 100644
--- a/lib/libvarnishapi/vsl_arg.c
+++ b/lib/libvarnishapi/vsl_arg.c
@@ -6,6 +6,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vsl_cursor.c b/lib/libvarnishapi/vsl_cursor.c
index c9505d484..aa77fdc1c 100644
--- a/lib/libvarnishapi/vsl_cursor.c
+++ b/lib/libvarnishapi/vsl_cursor.c
@@ -6,6 +6,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vsl_dispatch.c b/lib/libvarnishapi/vsl_dispatch.c
index e563ef751..8ce001409 100644
--- a/lib/libvarnishapi/vsl_dispatch.c
+++ b/lib/libvarnishapi/vsl_dispatch.c
@@ -5,6 +5,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vsl_glob_test.c b/lib/libvarnishapi/vsl_glob_test.c
index bf09d0be4..84814647f 100644
--- a/lib/libvarnishapi/vsl_glob_test.c
+++ b/lib/libvarnishapi/vsl_glob_test.c
@@ -4,6 +4,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vsl_query.c b/lib/libvarnishapi/vsl_query.c
index 227591190..eb08bf18a 100644
--- a/lib/libvarnishapi/vsl_query.c
+++ b/lib/libvarnishapi/vsl_query.c
@@ -5,6 +5,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 423211e56..4bc283ad2 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -6,6 +6,8 @@
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vut.c b/lib/libvarnishapi/vut.c
index 5c9d6a509..165c2e34d 100644
--- a/lib/libvarnishapi/vut.c
+++ b/lib/libvarnishapi/vut.c
@@ -5,6 +5,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vxp.c b/lib/libvarnishapi/vxp.c
index 4b23a8882..f23ffad3f 100644
--- a/lib/libvarnishapi/vxp.c
+++ b/lib/libvarnishapi/vxp.c
@@ -5,6 +5,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vxp.h b/lib/libvarnishapi/vxp.h
index 0cb7a9eca..337c4b519 100644
--- a/lib/libvarnishapi/vxp.h
+++ b/lib/libvarnishapi/vxp.h
@@ -5,6 +5,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vxp_lexer.c b/lib/libvarnishapi/vxp_lexer.c
index 49a8dfed4..18ae314da 100644
--- a/lib/libvarnishapi/vxp_lexer.c
+++ b/lib/libvarnishapi/vxp_lexer.c
@@ -5,6 +5,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vxp_parse.c b/lib/libvarnishapi/vxp_parse.c
index b11e8dd50..1dfd42065 100644
--- a/lib/libvarnishapi/vxp_parse.c
+++ b/lib/libvarnishapi/vxp_parse.c
@@ -5,6 +5,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvarnishapi/vxp_test.c b/lib/libvarnishapi/vxp_test.c
index 4cc0f8d81..359902025 100644
--- a/lib/libvarnishapi/vxp_test.c
+++ b/lib/libvarnishapi/vxp_test.c
@@ -4,6 +4,8 @@
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index f962a8810..749eebd38 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -6,6 +6,8 @@
 #
 # Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index 9ca756a88..cf18107d7 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_action.c b/lib/libvcc/vcc_action.c
index a1b57b407..542e1289f 100644
--- a/lib/libvcc/vcc_action.c
+++ b/lib/libvcc/vcc_action.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_backend.c b/lib/libvcc/vcc_backend.c
index 374eeec5c..217b2366a 100644
--- a/lib/libvcc/vcc_backend.c
+++ b/lib/libvcc/vcc_backend.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_backend_util.c b/lib/libvcc/vcc_backend_util.c
index e7c68edfc..fa3583a72 100644
--- a/lib/libvcc/vcc_backend_util.c
+++ b/lib/libvcc/vcc_backend_util.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_compile.c b/lib/libvcc/vcc_compile.c
index 31d27f970..b7ccc9cf1 100644
--- a/lib/libvcc/vcc_compile.c
+++ b/lib/libvcc/vcc_compile.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_compile.h b/lib/libvcc/vcc_compile.h
index 32de12063..ad1af617a 100644
--- a/lib/libvcc/vcc_compile.h
+++ b/lib/libvcc/vcc_compile.h
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index cacbbdfac..dc36effeb 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_parse.c b/lib/libvcc/vcc_parse.c
index 978c10057..2bfeb86fb 100644
--- a/lib/libvcc/vcc_parse.c
+++ b/lib/libvcc/vcc_parse.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_storage.c b/lib/libvcc/vcc_storage.c
index ac4fbeb7d..a0b160f37 100644
--- a/lib/libvcc/vcc_storage.c
+++ b/lib/libvcc/vcc_storage.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_symb.c b/lib/libvcc/vcc_symb.c
index 97d418921..bf33292e4 100644
--- a/lib/libvcc/vcc_symb.c
+++ b/lib/libvcc/vcc_symb.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_token.c b/lib/libvcc/vcc_token.c
index 20caadabe..0e3b4569d 100644
--- a/lib/libvcc/vcc_token.c
+++ b/lib/libvcc/vcc_token.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_types.c b/lib/libvcc/vcc_types.c
index 196efa539..2691a0531 100644
--- a/lib/libvcc/vcc_types.c
+++ b/lib/libvcc/vcc_types.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_utils.c b/lib/libvcc/vcc_utils.c
index 3270e203a..ea38f69f3 100644
--- a/lib/libvcc/vcc_utils.c
+++ b/lib/libvcc/vcc_utils.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_var.c b/lib/libvcc/vcc_var.c
index c662947c8..cdc071f9f 100644
--- a/lib/libvcc/vcc_var.c
+++ b/lib/libvcc/vcc_var.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_vmod.c b/lib/libvcc/vcc_vmod.c
index 96b119913..1f28b1758 100644
--- a/lib/libvcc/vcc_vmod.c
+++ b/lib/libvcc/vcc_vmod.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vcc_xref.c b/lib/libvcc/vcc_xref.c
index 1d902795f..9e66bdd8a 100644
--- a/lib/libvcc/vcc_xref.c
+++ b/lib/libvcc/vcc_xref.c
@@ -5,6 +5,8 @@
  *
  * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 6ed98632e..7f73d9c41 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -5,6 +5,8 @@
 #
 # Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/lib/libvcc/vsctool.py b/lib/libvcc/vsctool.py
index c175d181c..9df1dc40d 100644
--- a/lib/libvcc/vsctool.py
+++ b/lib/libvcc/vsctool.py
@@ -6,6 +6,8 @@
 #
 # Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/lib/libvmod_blob/base64.c b/lib/libvmod_blob/base64.c
index 45987c2ae..82f897dbe 100644
--- a/lib/libvmod_blob/base64.c
+++ b/lib/libvmod_blob/base64.c
@@ -5,6 +5,8 @@
  * Authors: Nils Goroll <nils.goroll at uplex.de>
  *          Geoffrey Simmons <geoffrey.simmons at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * 1. Redistributions of source code must retain the above copyright notice,
diff --git a/lib/libvmod_blob/hex.c b/lib/libvmod_blob/hex.c
index 2fe05a422..1444faeeb 100644
--- a/lib/libvmod_blob/hex.c
+++ b/lib/libvmod_blob/hex.c
@@ -5,6 +5,8 @@
  * Authors: Nils Goroll <nils.goroll at uplex.de>
  *          Geoffrey Simmons <geoffrey.simmons at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * 1. Redistributions of source code must retain the above copyright notice,
diff --git a/lib/libvmod_blob/hex.h b/lib/libvmod_blob/hex.h
index 53cfc8915..203a95aaa 100644
--- a/lib/libvmod_blob/hex.h
+++ b/lib/libvmod_blob/hex.h
@@ -5,6 +5,8 @@
  * Authors: Nils Goroll <nils.goroll at uplex.de>
  *          Geoffrey Simmons <geoffrey.simmons at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * 1. Redistributions of source code must retain the above copyright notice,
diff --git a/lib/libvmod_blob/id.c b/lib/libvmod_blob/id.c
index 3eb5ee28d..ad6b64607 100644
--- a/lib/libvmod_blob/id.c
+++ b/lib/libvmod_blob/id.c
@@ -5,6 +5,8 @@
  * Authors: Nils Goroll <nils.goroll at uplex.de>
  *          Geoffrey Simmons <geoffrey.simmons at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * 1. Redistributions of source code must retain the above copyright notice,
diff --git a/lib/libvmod_blob/url.c b/lib/libvmod_blob/url.c
index 65d678879..79fdc39b5 100644
--- a/lib/libvmod_blob/url.c
+++ b/lib/libvmod_blob/url.c
@@ -5,6 +5,8 @@
  * Authors: Nils Goroll <nils.goroll at uplex.de>
  *          Geoffrey Simmons <geoffrey.simmons at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * 1. Redistributions of source code must retain the above copyright notice,
diff --git a/lib/libvmod_blob/vmod_blob.c b/lib/libvmod_blob/vmod_blob.c
index 0092686e9..14c1d0160 100644
--- a/lib/libvmod_blob/vmod_blob.c
+++ b/lib/libvmod_blob/vmod_blob.c
@@ -5,6 +5,8 @@
  * Authors: Nils Goroll <nils.goroll at uplex.de>
  *          Geoffrey Simmons <geoffrey.simmons at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * 1. Redistributions of source code must retain the above copyright notice,
diff --git a/lib/libvmod_blob/vmod_blob.h b/lib/libvmod_blob/vmod_blob.h
index 5fd560816..fd728a93f 100644
--- a/lib/libvmod_blob/vmod_blob.h
+++ b/lib/libvmod_blob/vmod_blob.h
@@ -5,6 +5,8 @@
  * Authors: Nils Goroll <nils.goroll at uplex.de>
  *          Geoffrey Simmons <geoffrey.simmons at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * 1. Redistributions of source code must retain the above copyright notice,
diff --git a/lib/libvmod_debug/vmod.vcc b/lib/libvmod_debug/vmod.vcc
index e28bbd204..35ce24631 100644
--- a/lib/libvmod_debug/vmod.vcc
+++ b/lib/libvmod_debug/vmod.vcc
@@ -4,6 +4,8 @@
 #
 # Author: Poul-Henning Kamp <phk at FreeBSD.org>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index a17760e69..9f46a2436 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at FreeBSD.org>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_debug/vmod_debug_dyn.c b/lib/libvmod_debug/vmod_debug_dyn.c
index 6dc0af797..b2430a978 100644
--- a/lib/libvmod_debug/vmod_debug_dyn.c
+++ b/lib/libvmod_debug/vmod_debug_dyn.c
@@ -4,6 +4,8 @@
  *
  * Author: Dridi Boukelmoune <dridi at varnish-software.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_debug/vmod_debug_obj.c b/lib/libvmod_debug/vmod_debug_obj.c
index bd8cda714..0d32683b1 100644
--- a/lib/libvmod_debug/vmod_debug_obj.c
+++ b/lib/libvmod_debug/vmod_debug_obj.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at FreeBSD.org>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_directors/fall_back.c b/lib/libvmod_directors/fall_back.c
index c14e745af..72001d6de 100644
--- a/lib/libvmod_directors/fall_back.c
+++ b/lib/libvmod_directors/fall_back.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at FreeBSD.org>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_directors/hash.c b/lib/libvmod_directors/hash.c
index d1f7fd6b3..314e9a2c6 100644
--- a/lib/libvmod_directors/hash.c
+++ b/lib/libvmod_directors/hash.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at FreeBSD.org>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_directors/misc.c b/lib/libvmod_directors/misc.c
index c72799558..d70c8ce55 100644
--- a/lib/libvmod_directors/misc.c
+++ b/lib/libvmod_directors/misc.c
@@ -4,6 +4,8 @@
  *
  * Author: Nils Goroll <nils.goroll at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_directors/random.c b/lib/libvmod_directors/random.c
index 3be74527f..fc0e355c8 100644
--- a/lib/libvmod_directors/random.c
+++ b/lib/libvmod_directors/random.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at FreeBSD.org>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_directors/round_robin.c b/lib/libvmod_directors/round_robin.c
index d323f8a5e..bc4e81876 100644
--- a/lib/libvmod_directors/round_robin.c
+++ b/lib/libvmod_directors/round_robin.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at FreeBSD.org>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_directors/shard_cfg.c b/lib/libvmod_directors/shard_cfg.c
index cb67915c6..7567f0050 100644
--- a/lib/libvmod_directors/shard_cfg.c
+++ b/lib/libvmod_directors/shard_cfg.c
@@ -5,6 +5,8 @@
  * Authors: Nils Goroll <nils.goroll at uplex.de>
  *	    Geoffrey Simmons <geoff at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_directors/shard_cfg.h b/lib/libvmod_directors/shard_cfg.h
index 2ce1817b8..5c6f1e6b6 100644
--- a/lib/libvmod_directors/shard_cfg.h
+++ b/lib/libvmod_directors/shard_cfg.h
@@ -4,6 +4,8 @@
  *
  * Author: Nils Goroll <nils.goroll at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_directors/shard_dir.c b/lib/libvmod_directors/shard_dir.c
index 40472e677..850aeebcf 100644
--- a/lib/libvmod_directors/shard_dir.c
+++ b/lib/libvmod_directors/shard_dir.c
@@ -6,6 +6,8 @@
  *          Geoffrey Simmons <geoff.simmons at uplex.de>
  *          Julian Wiesener <jw at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_directors/shard_dir.h b/lib/libvmod_directors/shard_dir.h
index 1888aaf4b..067b4415a 100644
--- a/lib/libvmod_directors/shard_dir.h
+++ b/lib/libvmod_directors/shard_dir.h
@@ -5,6 +5,8 @@
  * Authors: Julian Wiesener <jw at uplex.de>
  *          Nils Goroll <slink at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_directors/vdir.c b/lib/libvmod_directors/vdir.c
index a862580b9..a4a24212c 100644
--- a/lib/libvmod_directors/vdir.c
+++ b/lib/libvmod_directors/vdir.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at FreeBSD.org>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_directors/vdir.h b/lib/libvmod_directors/vdir.h
index e448bee43..00b47b131 100644
--- a/lib/libvmod_directors/vdir.h
+++ b/lib/libvmod_directors/vdir.h
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at FreeBSD.org>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_directors/vmod.vcc b/lib/libvmod_directors/vmod.vcc
index 0f27f3c29..054b6c34e 100644
--- a/lib/libvmod_directors/vmod.vcc
+++ b/lib/libvmod_directors/vmod.vcc
@@ -11,6 +11,8 @@
 #	   Nils Goroll <slink at uplex.de>
 #	   Geoffrey Simmons <geoff at uplex.de>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/lib/libvmod_directors/vmod_shard.c b/lib/libvmod_directors/vmod_shard.c
index 09a547faa..7c56cedb6 100644
--- a/lib/libvmod_directors/vmod_shard.c
+++ b/lib/libvmod_directors/vmod_shard.c
@@ -5,6 +5,8 @@
  * Authors: Julian Wiesener <jw at uplex.de>
  *	    Nils Goroll <slink at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_proxy/vmod.vcc b/lib/libvmod_proxy/vmod.vcc
index d07456cb5..603456e1c 100644
--- a/lib/libvmod_proxy/vmod.vcc
+++ b/lib/libvmod_proxy/vmod.vcc
@@ -4,6 +4,8 @@
 #
 # Author: Emmanuel Hocdet <manu at gandi.net>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/lib/libvmod_proxy/vmod_proxy.c b/lib/libvmod_proxy/vmod_proxy.c
index 222de9c53..499cf24d3 100644
--- a/lib/libvmod_proxy/vmod_proxy.c
+++ b/lib/libvmod_proxy/vmod_proxy.c
@@ -4,6 +4,8 @@
  *
  * Author: Emmanuel Hocdet <manu at gandi.net>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_purge/vmod.vcc b/lib/libvmod_purge/vmod.vcc
index a0fafde83..fd320f816 100644
--- a/lib/libvmod_purge/vmod.vcc
+++ b/lib/libvmod_purge/vmod.vcc
@@ -4,6 +4,8 @@
 #
 # Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/lib/libvmod_purge/vmod_purge.c b/lib/libvmod_purge/vmod_purge.c
index 1a01bae50..fd68b31e4 100644
--- a/lib/libvmod_purge/vmod_purge.c
+++ b/lib/libvmod_purge/vmod_purge.c
@@ -4,6 +4,8 @@
  *
  * Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_std/vmod.vcc b/lib/libvmod_std/vmod.vcc
index 1b48351bb..8f8c7cacf 100644
--- a/lib/libvmod_std/vmod.vcc
+++ b/lib/libvmod_std/vmod.vcc
@@ -4,6 +4,8 @@
 #
 # Author: Poul-Henning Kamp <phk at FreeBSD.org>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index d1b7411ec..b3233d827 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at FreeBSD.org>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_std/vmod_std_conversions.c b/lib/libvmod_std/vmod_std_conversions.c
index 52a006205..e038d785a 100644
--- a/lib/libvmod_std/vmod_std_conversions.c
+++ b/lib/libvmod_std/vmod_std_conversions.c
@@ -4,6 +4,8 @@
  *
  * Author: Poul-Henning Kamp <phk at FreeBSD.org>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_std/vmod_std_fileread.c b/lib/libvmod_std/vmod_std_fileread.c
index 1bb003e48..cd9181e2b 100644
--- a/lib/libvmod_std/vmod_std_fileread.c
+++ b/lib/libvmod_std/vmod_std_fileread.c
@@ -4,6 +4,8 @@
  *
  * Author: Sanjoy Das <sanjoy at playingwithpointers.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_std/vmod_std_querysort.c b/lib/libvmod_std/vmod_std_querysort.c
index 4b99092f8..f5b5e115e 100644
--- a/lib/libvmod_std/vmod_std_querysort.c
+++ b/lib/libvmod_std/vmod_std_querysort.c
@@ -4,6 +4,8 @@
  *
  * Author: Naren Venkataraman of Vimeo Inc.
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/lib/libvmod_unix/cred_compat.h b/lib/libvmod_unix/cred_compat.h
index 6512d2122..9ac8438f8 100644
--- a/lib/libvmod_unix/cred_compat.h
+++ b/lib/libvmod_unix/cred_compat.h
@@ -4,6 +4,8 @@
  *
  * Authors: Geoffrey Simmons <geoffrey.simmons at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * 1. Redistributions of source code must retain the above copyright notice,
diff --git a/lib/libvmod_unix/vmod_unix.c b/lib/libvmod_unix/vmod_unix.c
index 4388d58d4..99159a182 100644
--- a/lib/libvmod_unix/vmod_unix.c
+++ b/lib/libvmod_unix/vmod_unix.c
@@ -4,6 +4,8 @@
  *
  * Authors: Geoffrey Simmons <geoffrey.simmons at uplex.de>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * 1. Redistributions of source code must retain the above copyright notice,
diff --git a/lib/libvmod_vtc/vmod.vcc b/lib/libvmod_vtc/vmod.vcc
index 22d3dded1..17a823f2c 100644
--- a/lib/libvmod_vtc/vmod.vcc
+++ b/lib/libvmod_vtc/vmod.vcc
@@ -4,6 +4,8 @@
 #
 # Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/lib/libvmod_vtc/vmod_vtc.c b/lib/libvmod_vtc/vmod_vtc.c
index 6bb31ba55..6b8c7bcf9 100644
--- a/lib/libvmod_vtc/vmod_vtc.c
+++ b/lib/libvmod_vtc/vmod_vtc.c
@@ -5,6 +5,8 @@
  * Author: Poul-Henning Kamp <phk at FreeBSD.org>
  * Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
  *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/tools/gcov_digest.py b/tools/gcov_digest.py
index 797d9dea0..464d56626 100644
--- a/tools/gcov_digest.py
+++ b/tools/gcov_digest.py
@@ -5,6 +5,8 @@
 #
 # Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/tools/vtc-bisect.sh b/tools/vtc-bisect.sh
index 050c3319c..e70c9fff9 100755
--- a/tools/vtc-bisect.sh
+++ b/tools/vtc-bisect.sh
@@ -5,6 +5,8 @@
 #
 # Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/tools/vtest.sh b/tools/vtest.sh
index c4bc26e02..2e451e638 100755
--- a/tools/vtest.sh
+++ b/tools/vtest.sh
@@ -5,6 +5,8 @@
 #
 # Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/varnish-legacy.m4 b/varnish-legacy.m4
index 9f67359ea..e4ba1b9ce 100644
--- a/varnish-legacy.m4
+++ b/varnish-legacy.m4
@@ -6,6 +6,8 @@
 #
 # Author: Tollef Fog Heen <tfheen at varnish-software.com>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
diff --git a/varnish.m4 b/varnish.m4
index 6a8eb0609..13a273f39 100644
--- a/varnish.m4
+++ b/varnish.m4
@@ -3,6 +3,8 @@
 #
 # Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
 #
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met: