diff --git a/tools/zsh/_all.sh b/tools/zsh/_all.sh
new file mode 100644
index 0000000..0f5a97d
--- /dev/null
+++ b/tools/zsh/_all.sh
@@ -0,0 +1,44 @@
+#compdef all.sh tests_all
+## Completion for tests/scripts/all.sh in Mbed TLS.
+
+_all_sh () {
+  local components line opt spec specs
+  components=()
+  specs=()
+  for line in "${(@M)${(@f)$(_call_program help $words[1] --help)}:# #-*}"; do
+    line=${line##[ ]##}
+    opt=(${(s:|:)${line%%[= ]*}})
+    spec=
+    line=${line#"${line%%[= ]*}"}
+    if [[ $line == \=* ]]; then
+      spec=":${${line#\=}%% *}:"
+      if [[ $spec == ":<"*">:" ]]; then
+        spec=":${${spec#??}%??}:"
+      fi
+      case $spec in
+        *_dir_path:) spec="${spec}_dirs";;
+        *_path:) spec="${spec}_files -g \"*(.*)\"";;
+      esac
+    elif [[ $opt[1] == '-s' || $opt[1] == '--seed' ]]; then
+      spec=":seed:"
+    fi
+    line=${line##[^ ]#[ ]##}
+    spec="[$line]${spec}"
+    specs+=($^opt$spec)
+    if ((${#${(M)opt:#--list-components}})); then
+      components=("${(@M)${(@f)$(_call_program list-components $words[1] --list-components)}}")
+    fi
+  done
+  if (($#components)); then
+    specs+=("*:component:($components)")
+  fi
+  _arguments : $specs
+}
+
+_all_sh "%@"
+
+# Local Variables:
+# mode: sh
+# sh-shell: zsh
+# End:
+
diff --git a/tools/zsh/_config.pl b/tools/zsh/_config.pl
new file mode 100644
index 0000000..cb48b65
--- /dev/null
+++ b/tools/zsh/_config.pl
@@ -0,0 +1,45 @@
+#compdef config.pl config.py
+## Completion for scripts/config.pl and scripts/config.pl in Mbed TLS.
+
+_config_pl_symbols () {
+  local -a identifiers
+  identifiers=("${(@f)$(_call_program _config_pl_symbols sed -n \''s!^/*\**#define \(MBEDTLS_[0-9A-Z_a-z][0-9A-Z_a-z]*\).*!\1!p'\' \$config_h)}")
+  _describe -t symbols 'config.h symbols' identifiers
+}
+
+_config_pl () {
+  local context state state_descr line
+  typeset -A opt_args
+  local ret=0 config_h=$words[1]:h/../include/mbedtls/config.h
+  local -a commands_with_descriptions
+  commands_with_descriptions=(
+    'baremetal:All features for bare metal platforms'
+    'get:Get symbol value'
+    'full:All features'
+    'realfull:Uncomment all #define'\'''
+    'set:Actvate symbol'
+    'unset:Deactivate symbol'
+  )
+  _arguments \
+    {'-f','--file'}'[file to edit]:file to edit:_files -g "*.h"' \
+    {'-o','--force'}'[define symbol even if not present]' \
+    '1:config.pl command:->command' \
+    '*::config.pl commands:->param'
+  case $state in
+    (command)
+      _describe -t commands 'config.pl command' commands_with_descriptions;;
+    (param)
+      case $words[1]:$CURRENT in
+        ((get|set|unset):2) _call_function ret _config_pl_symbols;;
+      esac;;
+  esac
+  return $ret
+}
+
+_config_pl "%@"
+
+# Local Variables:
+# mode: sh
+# sh-shell: zsh
+# End:
+
diff --git a/tools/zsh/_mbedtls-prepare-build b/tools/zsh/_mbedtls-prepare-build
new file mode 100644
index 0000000..962710e
--- /dev/null
+++ b/tools/zsh/_mbedtls-prepare-build
@@ -0,0 +1,106 @@
+#compdef mbedtls-prepare-build
+
+_mbedtls_prepare_build_symbols () {
+  local -a identifiers
+  identifiers=("${(@f)$(_call_program _config_pl_symbols sed -n \''s!^/*\**#define \(MBEDTLS_[0-9A-Z_a-z][0-9A-Z_a-z]*\).*!\1!p'\' \$source_dir/include/mbedtls/config.h)}")
+  if ((!$#identifiers)); then return 1; fi
+  _values -s , 'config.h symbols' $identifiers
+}
+
+_mbedtls_prepare_build () {
+  local context state state_descr line
+  typeset -A opt_args
+  local ret=0
+  local prefix spec
+  local -a specs; specs=()
+  local source_dir=.
+  local -a args; args=($words[2,-1])
+  local -a presets; presets=()
+
+  while (($#args)); do
+    case $args[1] in
+      (-s|--source) if (($#args >= 2)); then source_dir=$args[2]; fi;;
+      (--*=*) :;;
+      -*) if (($#args >= 2)); then shift args; fi;;
+    esac
+    shift args
+  done
+
+  state='options'
+  for line in "${(@f)${$(export COLUMNS=9999;
+                         _call_program help $words[1] --help)//$'\n    '/  }}"; do
+    # 1=opt1 3=?arg1 5=?opt2 7=descr
+    if [[ $state == 'options' &&
+          $line =~ '  (-[^ ]+)( ([^- ][^ ]*))?(, (-[^ ]+)( [^- ][^ ]*)?)*  +(.*)' ]]; then
+      spec="[${${match[7]//\]/\\\]}//:/\\:}]"
+      if [[ -n $match[3] ]]; then
+        spec="=$spec:$match[3]:->${match[1]}"
+      fi
+      case $match[1] in
+        (--config-set|--config-unset|--var) prefix='*';;
+        (*) prefix="($match[1] $match[5])";;
+      esac
+      if [[ -n $match[5] ]]; then
+        if [[ -n $spec ]]; then
+          if [[ $match[1] == --* ]]; then
+            match[1]="$match[1]="
+          else
+            match[1]="$match[1]+"
+          fi
+          if [[ $match[5] == --* ]]; then
+            match[5]="$match[5]="
+          else
+            match[5]="$match[5]+"
+          fi
+        fi
+        specs+=($prefix{$match[1],$match[5]}${spec#\=})
+      else
+        specs+=($prefix$match[1]$spec)
+      fi
+    elif [[ $state == 'presets' &&
+            $line =~ '([-0-9A-Z_a-z]+): *(.*)' ]]; then
+      presets+=($match[1]:$match[2])
+    elif [[ $line == 'Presets:' ]]; then
+      state='presets'
+    fi
+  done
+  line=
+  s=($specs)
+  _arguments $specs
+
+  case $state in
+    (--ar|--cc|--cp|--perl|--python|--rm|--valgrind)
+      _call_function ret _command_names -e;;
+    (--config-file)
+      _call_function ret _files -g "*.h";;
+    (--config-mode)
+      local -a config_modes
+      config_modes=(
+        'copy:Copy config.h'
+        'include:#include ${SOURCE_DIR}/config.h'
+      )
+      _call_function ret _describe -t config_mode 'Handling of config.h' config_modes;;
+    (--config-name)
+      local -a config_names
+      config_names=(
+        'baremetal:All features for bare metal platforms'
+        'full:All features'
+        'realfull:Uncomment all #define'\''s'
+      )
+      _call_function ret _describe -t config_name 'Preset configuration name' config_names;;
+    (--config-set|--config-unset)
+      _call_function ret _mbedtls_prepare_build_symbols;;
+    (--dir|--source)
+      _call_function ret _files -/;;
+    (--preset)
+      _call_function ret _describe -t preset 'Preset build name' presets;;
+  esac
+  return $ret
+}
+
+_mbedtls_prepare_build "$@"
+
+# Local Variables:
+# mode: sh
+# sh-shell: zsh
+# End:
diff --git a/tools/zsh/_ssl-opt.sh b/tools/zsh/_ssl-opt.sh
new file mode 100644
index 0000000..4b9225b
--- /dev/null
+++ b/tools/zsh/_ssl-opt.sh
@@ -0,0 +1,46 @@
+#compdef ssl-opt.sh compat.sh
+## Completion for tests/ssl-opt.sh and tests/compat.sh in Mbed TLS.
+
+_compat_sh_set_values () {
+  spec="$spec:$1: _values -s ' ' '$1' ${${line%'*}##*'}"
+}
+
+_ssl_opt_sh () {
+  local line opt spec specs
+  specs=()
+  for line in "${(@M)${(@)${(@f)$(_call_program help $words[1] --help)}//$'\t'##/ }:# #-*}"; do
+    line=${line## ##}
+    opt=(${(s:|:)${line%%[= ]*}})
+    spec=
+    line=${line#"${line%%[= ]*}"}
+    line=${line##[^ ]# ##}
+    spec="[$line]${spec}"
+    case $words[1]:t:r in
+      compat)
+        case $opt[1] in
+          -V) _compat_sh_set_values 'Verification modes';;
+          -e) spec="${spec}:Exclude matching ciphersuites (BRE):";;
+          -f) spec="${spec}:Restrict to matching ciphersuites (BRE):";;
+          -m) _compat_sh_set_values 'Protocol versions';;
+          -p) _compat_sh_set_values 'Peers';;
+          -t) _compat_sh_set_values 'Key exchange types';;
+        esac;;
+      ssl-opt)
+        case $opt[1] in
+          -e|-f) spec="${spec}:BRE:";;
+          --port|--*-port) spec="${spec}:port number:";;
+          --seed) spec="${spec}:seed:";;
+        esac;;
+    esac
+    specs+=($^opt$spec)
+  done
+  _arguments : $specs
+}
+
+_ssl_opt_sh "%@"
+
+# Local Variables:
+# mode: sh
+# sh-shell: zsh
+# End:
+
diff --git a/tools/zsh/_test-ref-configs.pl b/tools/zsh/_test-ref-configs.pl
new file mode 100644
index 0000000..137a63a
--- /dev/null
+++ b/tools/zsh/_test-ref-configs.pl
@@ -0,0 +1,14 @@
+#compdef test-ref-configs.pl
+## Completion for tests/test-ref-configs.pl in Mbed TLS.
+
+_test_ref_configs_pl () {
+  compadd $(sed -n '/%configs *=/,/;/ s/^ *'\''\([^'\'']*\)'\'' => {$/\1/p' $words[1])
+}
+
+_test_ref_configs_pl "%@"
+
+# Local Variables:
+# mode: sh
+# sh-shell: zsh
+# End:
+