diff --git a/contrib/pam_zfs_key/pam_zfs_key.c b/contrib/pam_zfs_key/pam_zfs_key.c
index c617a6e6b37..a0bc172c6f4 100644
--- a/contrib/pam_zfs_key/pam_zfs_key.c
+++ b/contrib/pam_zfs_key/pam_zfs_key.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * 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/sys/zstd/zstd.h b/include/sys/zstd/zstd.h
index 6d212b082f9..8c3c6e67e9c 100644
--- a/include/sys/zstd/zstd.h
+++ b/include/sys/zstd/zstd.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * BSD 3-Clause New License (https://spdx.org/licenses/BSD-3-Clause.html)
  *
diff --git a/lib/libzutil/os/linux/zutil_setproctitle.c b/lib/libzutil/os/linux/zutil_setproctitle.c
index e63acceb4f8..fc727e29ce2 100644
--- a/lib/libzutil/os/linux/zutil_setproctitle.c
+++ b/lib/libzutil/os/linux/zutil_setproctitle.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * Copyright © 2013 Guillem Jover <guillem@hadrons.org>
  *
diff --git a/module/lua/setjmp/setjmp_mips.S b/module/lua/setjmp/setjmp_mips.S
index 0084fbfa4be..9f52b83b85c 100644
--- a/module/lua/setjmp/setjmp_mips.S
+++ b/module/lua/setjmp/setjmp_mips.S
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
  *	The President and Fellows of Harvard College.
diff --git a/module/lua/setjmp/setjmp_sparc64.S b/module/lua/setjmp/setjmp_sparc64.S
index e1099643de9..08abf4b2831 100644
--- a/module/lua/setjmp/setjmp_sparc64.S
+++ b/module/lua/setjmp/setjmp_sparc64.S
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/module/zstd/include/aarch64_compat.h b/module/zstd/include/aarch64_compat.h
index 088517d3d23..9500a832b81 100644
--- a/module/zstd/include/aarch64_compat.h
+++ b/module/zstd/include/aarch64_compat.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * BSD 3-Clause New License (https://spdx.org/licenses/BSD-3-Clause.html)
  *
diff --git a/module/zstd/include/limits.h b/module/zstd/include/limits.h
index 3bf5b67765a..45b57f6e9f2 100644
--- a/module/zstd/include/limits.h
+++ b/module/zstd/include/limits.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * BSD 3-Clause New License (https://spdx.org/licenses/BSD-3-Clause.html)
  *
diff --git a/module/zstd/include/stddef.h b/module/zstd/include/stddef.h
index 3f46fb8b033..24c250fa5d2 100644
--- a/module/zstd/include/stddef.h
+++ b/module/zstd/include/stddef.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * BSD 3-Clause New License (https://spdx.org/licenses/BSD-3-Clause.html)
  *
diff --git a/module/zstd/include/stdint.h b/module/zstd/include/stdint.h
index 2d98a556c23..31e11f57868 100644
--- a/module/zstd/include/stdint.h
+++ b/module/zstd/include/stdint.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * BSD 3-Clause New License (https://spdx.org/licenses/BSD-3-Clause.html)
  *
diff --git a/module/zstd/include/stdio.h b/module/zstd/include/stdio.h
index 5a7c6ec6991..50b698fa207 100644
--- a/module/zstd/include/stdio.h
+++ b/module/zstd/include/stdio.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * BSD 3-Clause New License (https://spdx.org/licenses/BSD-3-Clause.html)
  *
diff --git a/module/zstd/include/stdlib.h b/module/zstd/include/stdlib.h
index c341a0c8488..cc66184fa2a 100644
--- a/module/zstd/include/stdlib.h
+++ b/module/zstd/include/stdlib.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * BSD 3-Clause New License (https://spdx.org/licenses/BSD-3-Clause.html)
  *
diff --git a/module/zstd/include/string.h b/module/zstd/include/string.h
index 7474e7f1af0..b058bafc1ad 100644
--- a/module/zstd/include/string.h
+++ b/module/zstd/include/string.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * BSD 3-Clause New License (https://spdx.org/licenses/BSD-3-Clause.html)
  *
diff --git a/module/zstd/include/zstd_compat_wrapper.h b/module/zstd/include/zstd_compat_wrapper.h
index 4e6561f31a6..51e67ab6b8a 100644
--- a/module/zstd/include/zstd_compat_wrapper.h
+++ b/module/zstd/include/zstd_compat_wrapper.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * BSD 3-Clause New License (https://spdx.org/licenses/BSD-3-Clause.html)
  *
diff --git a/module/zstd/zfs_zstd.c b/module/zstd/zfs_zstd.c
index e113962f65b..b42066fdb7c 100644
--- a/module/zstd/zfs_zstd.c
+++ b/module/zstd/zfs_zstd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * BSD 3-Clause New License (https://spdx.org/licenses/BSD-3-Clause.html)
  *
diff --git a/module/zstd/zstd-in.c b/module/zstd/zstd-in.c
index 121f375e551..fb56b19fefd 100644
--- a/module/zstd/zstd-in.c
+++ b/module/zstd/zstd-in.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * BSD 3-Clause Clear License
  *