diff --git a/README.md b/README.md
index acee3ac..05ebfd3 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,10 @@ A collection of POSIX shell scripts to invoke archiver programs
 
            (s)tar/gzip/bzip2/xz/zip/7z/lzma/lrzip/arj/zoo/brotli/zopfli/zstd
 
-Author: Martin Väth <vaeth@mvath.de>
+Author: Martin Väth <martin at mvath.de>
 
 This project is under the BSD license 2.0 (“3-clause BSD license”).
+SPDX-License-Identifier: BSD-3-Clause
 
 These are some POSIX shell scripts which form an interface to
 various archiver programs like
diff --git a/archwrap_alias b/archwrap_alias
index 34a578d..48cd4eb 100644
--- a/archwrap_alias
+++ b/archwrap_alias
@@ -1,4 +1,5 @@
-
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 alias ud='u -d'
 alias uv='u -l'
 alias tard='tgzd -t'
diff --git a/bin/2pd b/bin/2pd
index bd318cc..bfea978 100755
--- a/bin/2pd
+++ b/bin/2pd
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 Echo() {
 	printf '%s\n' "$*"
diff --git a/bin/7zbest b/bin/7zbest
index 0ad77be..97368f5 100755
--- a/bin/7zbest
+++ b/bin/7zbest
@@ -1,4 +1,6 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 exec 7za a -si -so -- ${1+"$@"}
diff --git a/bin/archwrap.sh b/bin/archwrap.sh
index d39d4ea..2a2f997 100644
--- a/bin/archwrap.sh
+++ b/bin/archwrap.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 # This script is part of Martin V\"ath's archwrap project.
 # It provides shell functions for scripts like "tgzd" "zipd" "u"
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 
 YesNo() {
 	case ${1:-n} in
diff --git a/bin/brotlibest b/bin/brotlibest
index d73eb2d..cd05200 100755
--- a/bin/brotlibest
+++ b/bin/brotlibest
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 . archwrap.sh
 set -f
diff --git a/bin/brotlicat b/bin/brotlicat
index 5382760..f03092e 100755
--- a/bin/brotlicat
+++ b/bin/brotlicat
@@ -1,4 +1,6 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
-brotli -dcf ${1+"$@"}
+exec brotli -dcf ${1+"$@"}
diff --git a/bin/bzipbest b/bin/bzipbest
index b689667..d819572 100755
--- a/bin/bzipbest
+++ b/bin/bzipbest
@@ -1,4 +1,6 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 exec bzip2 -9 ${1+"$@"}
diff --git a/bin/gzipbest b/bin/gzipbest
index aa836a0..1713cac 100755
--- a/bin/gzipbest
+++ b/bin/gzipbest
@@ -1,4 +1,6 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 exec gzip -9 ${1+"$@"}
diff --git a/bin/lz4best b/bin/lz4best
index b4cd951..936f87f 100755
--- a/bin/lz4best
+++ b/bin/lz4best
@@ -1,4 +1,6 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 exec lz4 -9 ${1+"$@"}
diff --git a/bin/lz4less b/bin/lz4less
index aefd434..b1594a3 100755
--- a/bin/lz4less
+++ b/bin/lz4less
@@ -1,4 +1,6 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 lz4cat "$@" | less
diff --git a/bin/pd b/bin/pd
index 34081a8..f2f2045 100755
--- a/bin/pd
+++ b/bin/pd
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 . archwrap.sh
 
diff --git a/bin/sshcat b/bin/sshcat
index 0f229ad..d3e0f25 100755
--- a/bin/sshcat
+++ b/bin/sshcat
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 . archwrap.sh
 
diff --git a/bin/tgzd b/bin/tgzd
index 635c715..ba8b074 100755
--- a/bin/tgzd
+++ b/bin/tgzd
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 . archwrap.sh
 
diff --git a/bin/u b/bin/u
index 9923994..3b36c8b 100755
--- a/bin/u
+++ b/bin/u
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 . archwrap.sh
 
diff --git a/bin/unzstdbest b/bin/unzstdbest
index f0b8267..ca6350f 100755
--- a/bin/unzstdbest
+++ b/bin/unzstdbest
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 set -f
 
diff --git a/bin/xzbest b/bin/xzbest
index d10c63a..25e7ceb 100755
--- a/bin/xzbest
+++ b/bin/xzbest
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 . archwrap.sh
 set -f
diff --git a/bin/zipd b/bin/zipd
index 0974bb0..c11c249 100755
--- a/bin/zipd
+++ b/bin/zipd
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 . archwrap.sh
 
diff --git a/bin/zopflibest b/bin/zopflibest
index 09d7e88..55f4491 100755
--- a/bin/zopflibest
+++ b/bin/zopflibest
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 which=`command -v which` || which=
 if [ x"$which" = x'which' ]
diff --git a/bin/zstdbest b/bin/zstdbest
index 37b5f83..9cf873f 100755
--- a/bin/zstdbest
+++ b/bin/zstdbest
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 # This script is part of Martin V\"ath's archwrap project.
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 set -u
 . archwrap.sh
 set -f
diff --git a/zsh/_2pd b/zsh/_2pd
index 16d8880..3bb12e1 100644
--- a/zsh/_2pd
+++ b/zsh/_2pd
@@ -1,4 +1,6 @@
 #compdef 2pd 2ppd
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 _arguments -S -A '-*' : \
 '(* -)'{'--help','--Help','-h','-\\?'}'[help]' \
 '-tmp[Use current directory instead of /tmp for tempdirectory]' \
diff --git a/zsh/_pd b/zsh/_pd
index f2cb80d..aac7a34 100644
--- a/zsh/_pd
+++ b/zsh/_pd
@@ -1,4 +1,6 @@
 #compdef pd ppd
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 _arguments -s -S -A '-*' : \
 '(* -)'{'-h','-H'}'[help]' \
 '-X[use long appendix (.tar.gz instead of .tgz etc)]' \
diff --git a/zsh/_tgzd b/zsh/_tgzd
index f5fd46f..1631dd3 100644
--- a/zsh/_tgzd
+++ b/zsh/_tgzd
@@ -1,4 +1,6 @@
 #compdef 7zd brd bzipd gzipd lrzd lz4d lzmad t7zd tard tbrd tbzd tgzd tlrd tlzd tlz4d txzd tzsd xzd zstdd
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 _arguments -s -S -A '-*' : \
 '(* -)'{'-h','-H'}'[help]' \
 '-R+[store output in PATH; use e.g. -R - for piping to stdout]:output-path:_files -/' \
diff --git a/zsh/_u b/zsh/_u
index e26254c..c9b790c 100644
--- a/zsh/_u
+++ b/zsh/_u
@@ -1,4 +1,6 @@
 #compdef u ud uv
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 _arguments -s -S -A '-*' : \
 '(* -)'{'-h','-H'}'[help]' \
 '-d[uncompress into new directory ./ARCHIVE instead of .]' \
diff --git a/zsh/_zipd b/zsh/_zipd
index 6390570..4ee8c90 100644
--- a/zsh/_zipd
+++ b/zsh/_zipd
@@ -1,4 +1,6 @@
 #compdef zipd
+# (C) Martin V\"ath <martin at mvath.de>
+# SPDX-License-Identifier: BSD-3-Clause
 _arguments -s -S -A '-*' : \
 '(* -)'{'-h','-H'}'[help]' \
 '-F[Symbolic links are stored as such (default)]' \