Adding upstream version 252.22.upstream/252.22

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

60 files changed, 6413 insertions, 0 deletions

diff --git a/shell-completion/bash/bootctl b/shell-completion/bash/bootctl
new file mode 100644
index 0000000..0b7cef7
--- /dev/null
+++ b/shell-completion/bash/bootctl
@@ -0,0 +1,109 @@
+# bootctl(1) completion                               -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_entry_ids() {
+    bootctl --no-pager list 2>/dev/null | { while read -r a b; do [[ $a == 'id:' ]] && echo " $b"; done }
+}
+
+_bootctl() {
+    local i verb comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local -A OPTS=(
+        [STANDALONE]='-h --help -p --print-esp-path -x --print-boot-path --version --no-variables --no-pager --graceful'
+        [ARG]='--esp-path --boot-path --make-machine-id-directory --root --image --install-source'
+    )
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --esp-path|--boot-path)
+                if [[ -z $cur ]]; then
+                    comps=$(compgen -A directory -- "/" )
+                else
+                    comps=$(compgen -A directory -- "$cur" )
+                fi
+                compopt -o filenames
+                ;;
+            --make-machine-id-directory)
+                comps="yes no auto"
+                ;;
+            --image|--root)
+                compopt -o nospace
+                comps=$( compgen -A file -- "$cur" )
+                ;;
+            --install-source)
+                comps="image host auto"
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    local -A VERBS=(
+        # systemd-efi-options takes an argument, but it is free-form, so we cannot complete it
+        [STANDALONE]='help status install update remove is-installed random-seed systemd-efi-options list set-timeout set-timeout-oneshot'
+        [BOOTENTRY]='set-default set-oneshot'
+        [BOOLEAN]='reboot-to-firmware'
+    )
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if [[ -z ${verb-} ]]; then
+        comps=${VERBS[*]}
+    elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
+        comps=''
+    elif __contains_word "$verb" ${VERBS[BOOTENTRY]}; then
+        name=
+        for ((i++; i < COMP_CWORD; i++)); do
+            if ! __contains_word "${COMP_WORDS[i]}" ${OPTS[*]} ${VERBS[*]} &&
+                    ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+                name=${COMP_WORDS[i]}
+                break;
+            fi
+        done
+
+        if [[ -z $name ]]; then
+            comps=$( __get_entry_ids )
+        else
+            comps=''
+        fi
+    elif __contains_word "$verb" ${VERBS[BOOLEAN]}; then
+        comps="yes no"
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _bootctl bootctl
diff --git a/shell-completion/bash/busctl b/shell-completion/bash/busctl
new file mode 100644
index 0000000..84bd67c
--- /dev/null
+++ b/shell-completion/bash/busctl
@@ -0,0 +1,208 @@
+# busctl(1) completion                               -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_machines() {
+    local a b
+    { machinectl list --full --max-addresses=0 --no-legend --no-pager 2>/dev/null; echo ".host"; } | \
+	{ while read a b; do echo " $a"; done; } | \
+        sort -u
+}
+
+__get_busnames() {
+    local mode=$1
+    local a b
+    busctl $mode list --no-legend --no-pager --full 2>/dev/null |
+        { while read a b; do echo " $a"; done; };
+}
+
+__get_objects() {
+    local mode=$1
+    local busname=$2
+    local a b
+    busctl $mode tree --list --no-legend --no-pager $busname 2>/dev/null |
+        { while read a b; do echo " $a"; done; };
+}
+
+__get_interfaces() {
+    local mode=$1
+    local busname=$2
+    local path=$3
+    local a b c
+    busctl $mode introspect --list --no-legend --no-pager $busname $path 2>/dev/null |
+        { while read a b c; do [[ "$b" == "interface" ]] && echo " $a"; done; };
+}
+
+__get_members() {
+    local mode=$1
+    local busname=$2
+    local path=$3
+    local interface=$4
+    local type=$5
+    local flags=$6
+    local a b c d e
+    busctl $mode introspect --list --no-legend --no-pager $busname $path $interface 2>/dev/null |
+        sed -e 's/^\.//' |
+        { while read a b c d e; do [[ "$b" == "$type" && ( -z $flags || "$e" == "$flags" ) ]] && echo " $a"; done; };
+}
+
+__get_signature() {
+    local mode=$1
+    local busname=$2
+    local path=$3
+    local interface=$4
+    local member=$5
+    local a b c d
+    busctl $mode introspect --list --no-legend --no-pager $busname $path $interface 2>/dev/null |
+        sed -e 's/^\.//' | { while read a b c d; do [[ "$a" == "$member" && "$c" != '-' ]] && echo " \"$c\""; done; };
+}
+
+_busctl() {
+    local i n verb comps mode
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version --no-pager --no-legend --system --user
+                      --show-machine --unique --acquired --activatable --list
+                      -q --quiet --verbose --expect-reply=no --auto-start=no
+                      --allow-interactive-authorization=no --augment-creds=no
+                      --watch-bind=yes -j -l --full --xml-interface'
+        [ARG]='--address -H --host -M --machine --match --timeout --size --json
+                      --destination'
+    )
+
+    if __contains_word "--user" ${COMP_WORDS[*]}; then
+        mode=--user
+    else
+        mode=--system
+    fi
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --host|-H)
+                comps=$(compgen -A hostname)
+                ;;
+            --machine|-M)
+                comps=$( __get_machines )
+                ;;
+            --json)
+                comps=$( busctl --json=help 2>/dev/null )
+                ;;
+            --destination)
+                comps=$( __get_busnames $mode )
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    local -A VERBS=(
+        [STANDALONE]='list help'
+        [BUSNAME]='status monitor capture tree'
+        [OBJECT]='introspect'
+        [METHOD]='call'
+        [EMIT]='emit'
+        [PROPERTY_GET]='get-property'
+        [PROPERTY_SET]='set-property'
+    )
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
+                ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    n=$(($COMP_CWORD - $i))
+
+    if [[ -z ${verb-} ]]; then
+        comps=${VERBS[*]}
+    elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
+        comps=''
+    elif __contains_word "$verb" ${VERBS[BUSNAME]}; then
+        comps=$( __get_busnames $mode)
+    elif __contains_word "$verb" ${VERBS[OBJECT]}; then
+        if [[ $n -eq 1 ]] ; then
+            comps=$( __get_busnames $mode)
+        elif [[ $n -eq 2 ]] ; then
+            comps=$( __get_objects $mode ${COMP_WORDS[COMP_CWORD-1]})
+        elif [[ $n -eq 3 ]] ; then
+            comps=$( __get_interfaces $mode ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]})
+        else
+            comps=''
+        fi
+    elif __contains_word "$verb" ${VERBS[METHOD]}; then
+        if [[ $n -eq 1 ]] ; then
+            comps=$( __get_busnames $mode)
+        elif [[ $n -eq 2 ]] ; then
+            comps=$( __get_objects $mode ${COMP_WORDS[COMP_CWORD-1]})
+        elif [[ $n -eq 3 ]] ; then
+            comps=$( __get_interfaces $mode ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]})
+        elif [[ $n -eq 4 ]] ; then
+            comps=$( __get_members $mode ${COMP_WORDS[COMP_CWORD-3]} ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]} method)
+        elif [[ $n -eq 5 ]] ; then
+            comps=$( __get_signature $mode ${COMP_WORDS[COMP_CWORD-4]} ${COMP_WORDS[COMP_CWORD-3]} ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]})
+        else
+            comps=''
+        fi
+    elif __contains_word "$verb" ${VERBS[EMIT]}; then
+        comps=''
+    elif __contains_word "$verb" ${VERBS[PROPERTY_GET]}; then
+        if [[ $n -eq 1 ]] ; then
+            comps=$( __get_busnames $mode)
+        elif [[ $n -eq 2 ]] ; then
+            comps=$( __get_objects $mode ${COMP_WORDS[COMP_CWORD-1]})
+        elif [[ $n -eq 3 ]] ; then
+            comps=$( __get_interfaces $mode ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]})
+        elif [[ $n -eq 4 ]] ; then
+            comps=$( __get_members $mode ${COMP_WORDS[COMP_CWORD-3]} ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]} property)
+        else
+            comps=''
+        fi
+    elif __contains_word "$verb" ${VERBS[PROPERTY_SET]}; then
+        if [[ $n -eq 1 ]] ; then
+            comps=$( __get_busnames $mode)
+        elif [[ $n -eq 2 ]] ; then
+            comps=$( __get_objects $mode ${COMP_WORDS[COMP_CWORD-1]})
+        elif [[ $n -eq 3 ]] ; then
+            comps=$( __get_interfaces $mode ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]})
+        elif [[ $n -eq 4 ]] ; then
+            comps=$( __get_members $mode ${COMP_WORDS[COMP_CWORD-3]} ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]} property writable)
+        elif [[ $n -eq 5 ]] ; then
+            comps=$( __get_signature $mode ${COMP_WORDS[COMP_CWORD-4]} ${COMP_WORDS[COMP_CWORD-3]} ${COMP_WORDS[COMP_CWORD-2]} ${COMP_WORDS[COMP_CWORD-1]})
+        else
+            comps=''
+        fi
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _busctl busctl
diff --git a/shell-completion/bash/coredumpctl b/shell-completion/bash/coredumpctl
new file mode 100644
index 0000000..b571990
--- /dev/null
+++ b/shell-completion/bash/coredumpctl
@@ -0,0 +1,97 @@
+# coredumpctl(1) completion                       -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# Copyright © 2010 Ran Benita
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__journal_fields=(MESSAGE{,_ID} PRIORITY CODE_{FILE,LINE,FUNC}
+                  ERRNO SYSLOG_{FACILITY,IDENTIFIER,PID} COREDUMP_EXE
+                  _{P,U,G}ID _COMM _EXE _CMDLINE
+                  _AUDIT_{SESSION,LOGINUID}
+                  _SYSTEMD_{CGROUP,SESSION,UNIT,OWNER_UID}
+                  _SELINUX_CONTEXT _SOURCE_REALTIME_TIMESTAMP
+                  _{BOOT,MACHINE}_ID _HOSTNAME _TRANSPORT
+                  _KERNEL_{DEVICE,SUBSYSTEM}
+                  _UDEV_{SYSNAME,DEVNODE,DEVLINK}
+                  __CURSOR __{REALTIME,MONOTONIC}_TIMESTAMP)
+_coredumpctl() {
+    local i verb comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local OPTS='-h --help --version --no-pager --no-legend -o --output -F --field -1
+                -r --reverse -S --since -U --until -D --directory -q --quiet --debugger
+                -A --debugger-arguments --json -n --all --file --root --image'
+
+    local -A VERBS=(
+        [LIST]='list info'
+        [DUMP]='dump debug'
+    )
+
+    if __contains_word "$prev" --output -o --file --image; then
+        comps=$( compgen -A file -- "$cur" )
+        compopt -o filenames
+    elif __contains_word "$prev" -D --directory --root; then
+        comps=$( compgen -A directory -- "$cur" )
+        compopt -o filenames
+    elif __contains_word "$prev" '--debugger'; then
+        comps=$( compgen -A command -- "$cur" )
+        compopt -o filenames
+    elif __contains_word "$prev" --field -F; then
+        comps=$( compgen -W '${__journal_fields[*]}' -- "$cur" )
+    elif __contains_word "$prev" '--json'; then
+        comps=$( compgen -W 'pretty short off' -- "$cur" )
+    elif [[ $cur = -* ]]; then
+        comps=${OPTS}
+    elif __contains_word "$prev" ${VERBS[*]} &&
+            ! __contains_word ${COMP_WORDS[COMP_CWORD-2]} \
+              '--output -o -D --directory -F --field --debugger'; then
+        compopt -o nospace
+        COMPREPLY=( $(compgen -W '${__journal_fields[*]}' -S= -- "$cur") )
+        return 0
+    elif [[ $cur = *=* ]]; then
+        mapfile -t field_vals < <(coredumpctl -F "${prev%=}" 2>/dev/null)
+        COMPREPLY=( $(compgen -W '${field_vals[*]}' -- "${cur#=}") )
+        return 0
+    elif [[ $prev = '=' ]]; then
+        mapfile -t field_vals < <(coredumpctl -F "${COMP_WORDS[COMP_CWORD-2]}" 2>/dev/null)
+        comps=${field_vals[*]}
+    else
+        for ((i=0; i <= COMP_CWORD; i++)); do
+            if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]}; then
+                verb=${COMP_WORDS[i]}
+                break
+            fi
+        done
+
+        if [[ -z ${verb-} ]]; then
+            comps=${VERBS[*]}
+        elif __contains_word "$verb" ${VERBS[LIST]} ${VERBS[DUMP]}; then
+            comps=''
+        fi
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _coredumpctl coredumpctl
diff --git a/shell-completion/bash/homectl b/shell-completion/bash/homectl
new file mode 100644
index 0000000..166a508
--- /dev/null
+++ b/shell-completion/bash/homectl
@@ -0,0 +1,190 @@
+# homectl(1) completion                               -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_machines() {
+    local a b
+    machinectl list --full --no-legend --no-pager 2>/dev/null |
+        { while read a b; do echo " $a"; done; };
+}
+
+__get_homes() {
+    homectl --no-pager --no-legend list 2>/dev/null
+}
+
+_homectl() {
+    local i verb comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version
+                     --no-pager --no-legend --no-ask-password
+                     -j -E -P'
+        [ARG]='      -H --host
+                     -M --machine
+                        --identity
+                        --json
+                        --export-format
+                     -c --real-name
+                        --realm
+                        --email-address
+                        --location
+                        --icon-name
+                     -d --home-dir
+                        --uid
+                     -G --member-of
+                        --skel
+                        --shell
+                        --setenv
+                        --timezone
+                        --language
+                        --ssh-authorized-keys
+                        --pkcs11-token-uri
+                        --locked
+                        --not-before
+                        --not-after
+                        --rate-limit-interval
+                        --rate-limit-burst
+                        --password-hint
+                        --enforce-password-policy
+                        --password-change-now
+                        --password-change-min
+                        --password-change-max
+                        --password-change-warn
+                        --password-change-inactive
+                        --disk-size
+                        --access-mode
+                        --umask
+                        --nice
+                        --rlimit
+                        --tasks-max
+                        --memory-high
+                        --memory-max
+                        --cpu-weight
+                        --io-weight
+                        --storage
+                        --image-path
+                        --fs-type
+                        --luks-discard
+                        --luks-offline-discard
+                        --luks-cipher
+                        --luks-cipher-mode
+                        --luks-volume-key-size
+                        --luks-pbkdf-type
+                        --luks-pbkdf-hash-algorithm
+                        --luks-pbkdf-time-cost
+                        --luks-pbkdf-memory-cost
+                        --luks-pbkdf-parallel-threads
+                        --luks-sector-size
+                        --nosuid
+                        --nodev
+                        --noexec
+                        --cifs-domain
+                        --cifs-user-name
+                        --cifs-service
+                        --stop-delay
+                        --kill-processes
+                        --auto-login'
+    )
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --host|-H)
+                comps=$(compgen -A hostname)
+                ;;
+            --machine|-M)
+                comps=$( __get_machines )
+                ;;
+            --identity|--image-path)
+                comps=$(compgen -A file -- "$cur" )
+                compopt -o filenames
+                ;;
+            --json)
+                comps='pretty short off'
+                ;;
+            --export-format)
+                comps='full stripped minimal'
+                ;;
+            --locked|--enforce-password-policy|--password-change-now|--luks-discard|--luks-offline-discard|--nosuid|--nodev|--noexec|--kill-processes|--auto-login)
+                comps='yes no'
+                ;;
+            -d|--home-dir|--skel)
+                comps=$(compgen -A directory -- "$cur" )
+                compopt -o dirnames
+                ;;
+            -G|--member-of)
+                comps=$(compgen -A group -- "$cur" )
+                ;;
+            --shell)
+                comps=$(cat /etc/shells)
+                ;;
+            --fs-type)
+                comps='btrfs ext4 xfs'
+                ;;
+            --cifs-user-name)
+                comps=$(compgen -A user -- "$cur" )
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    local -A VERBS=(
+        [STANDALONE]='list lock-all'
+        [CREATE]='create'
+        [NAMES]='activate deactivate inspect authenticate remove lock unlock'
+        [NAME]='update passwd'
+        [RESIZE]='resize'
+        [WITH]='with'
+    )
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if [[ -z ${verb-} ]]; then
+        comps=${VERBS[*]}
+    elif __contains_word "$verb" ${VERBS[NAME]}; then
+        comps=$(__get_homes)
+    elif __contains_word "$verb" ${VERBS[NAMES]}; then
+        comps=$(__get_homes)
+    elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[CREATE]} ${VERBS[RESIZE]}; then
+        comps=$(__get_homes)
+    elif __contains_word "$verb" ${VERBS[WITH]}; then
+        comps=$(__get_homes)
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _homectl homectl
diff --git a/shell-completion/bash/hostnamectl b/shell-completion/bash/hostnamectl
new file mode 100644
index 0000000..63edc08
--- /dev/null
+++ b/shell-completion/bash/hostnamectl
@@ -0,0 +1,92 @@
+# hostnamectl(1) completion                               -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# Copyright © 2010 Ran Benita
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_machines() {
+    local a b
+    machinectl list --full --no-legend --no-pager 2>/dev/null |
+        { while read a b; do echo " $a"; done; };
+}
+
+_hostnamectl() {
+    local i verb comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version --transient --static --pretty --no-ask-password'
+        [ARG]='-H --host -M --machine --json'
+    )
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --host|-H)
+                comps=$(compgen -A hostname)
+                ;;
+            --machine|-M)
+                comps=$( __get_machines )
+                ;;
+            --json)
+                comps=$( hostnamectl --json=help 2>/dev/null )
+                ;;
+            *)
+                return 0
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ $cur = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    local -A VERBS=(
+        [STANDALONE]='status'
+        [ICONS]='icon-name'
+        [NAME]='hostname deployment location'
+        [CHASSIS]='chassis'
+    )
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if [[ -z ${verb-} ]]; then
+        comps=${VERBS[*]}
+    elif __contains_word "$verb" ${VERBS[CHASSIS]}; then
+        comps='desktop laptop convertible server tablet handset watch embedded vm container'
+    elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[ICONS]} ${VERBS[NAME]}; then
+        comps=''
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _hostnamectl hostnamectl
diff --git a/shell-completion/bash/journalctl b/shell-completion/bash/journalctl
new file mode 100644
index 0000000..067b053
--- /dev/null
+++ b/shell-completion/bash/journalctl
@@ -0,0 +1,154 @@
+# journalctl(1) completion                                -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# Copyright © 2010 Ran Benita
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_machines() {
+    local a b
+    { machinectl list --full --max-addresses=0 --no-legend --no-pager 2>/dev/null; echo ".host"; } | \
+	{ while read a b; do echo " $a"; done; } | \
+        sort -u
+}
+
+__syslog_priorities=(emerg alert crit err warning notice info debug)
+__syslog_facilities=(kern user mail daemon auth syslog lpr news uucp cron authpriv ftp local0 local1 local2 local3 local4 local5 local6 local7)
+
+_journalctl() {
+    local field_vals= cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local -A OPTS=(
+        [STANDALONE]='-a --all --full --system --user
+                      --disk-usage -f --follow --header
+                      -h --help -l --local -m --merge --no-pager
+                      --no-tail -q --quiet --setup-keys --verify
+                      --version --list-catalog --update-catalog --list-boots
+                      --show-cursor --dmesg -k --pager-end -e -r --reverse
+                      --utc -x --catalog --no-full --force --dump-catalog
+                      --flush --rotate --sync --no-hostname -N --fields'
+        [ARG]='-b --boot -D --directory --file -F --field -t --identifier --facility
+                      -M --machine -o --output -u --unit --user-unit -p --priority
+                      --root --case-sensitive'
+        [ARGUNKNOWN]='-c --cursor --interval -n --lines -S --since -U --until
+                      --after-cursor --cursor-file --verify-key -g --grep
+                      --vacuum-size --vacuum-time --vacuum-files --output-fields'
+    )
+
+    # Use the default completion for shell redirect operators
+    if __contains_word "$prev" '>' '>>' '&>'; then
+        compopt -o filenames
+        COMPREPLY=( $(compgen -f -- "$cur") )
+        return 0;
+    fi
+
+    if __contains_word "$prev" ${OPTS[ARG]} ${OPTS[ARGUNKNOWN]}; then
+        case $prev in
+            --boot|-b)
+                comps=$(journalctl -F '_BOOT_ID' 2>/dev/null)
+                ;;
+            --directory|-D|--root)
+                comps=$(compgen -d -- "$cur")
+                compopt -o filenames
+                ;;
+            --file)
+                comps=$(compgen -f -- "$cur")
+                compopt -o filenames
+                ;;
+            --output|-o)
+                comps=$( journalctl --output=help 2>/dev/null )
+                ;;
+            --field|-F)
+                comps=$(journalctl --fields | sort 2>/dev/null)
+                ;;
+            --machine|-M)
+                comps=$( __get_machines )
+                ;;
+            --facility)
+                comps=${__syslog_facilities[*]}
+                ;;
+            --priority|-p)
+                comps=${__syslog_priorities[*]}
+                compopt -o nosort
+                ;;
+            --unit|-u)
+                comps=$(journalctl -F '_SYSTEMD_UNIT' 2>/dev/null)
+                # Similarly to systemctl, we need to distinguish between
+                # escaped and unescaped names in order to be able to correctly
+                # complete them. In this particular case, if the name we're
+                # trying to complete is unescaped (i.e. foo\x2dbaz), escape
+                # it first, so the compgen below works as expected. For more
+                # information about these shenanigans see the systemctl
+                # completion file
+                if ! [[ $cur =~ '\\' ]]; then
+                    cur="$(printf '%q' $cur)"
+                fi
+                compopt -o filenames
+                ;;
+            --user-unit)
+                comps=$(journalctl -F '_SYSTEMD_USER_UNIT' 2>/dev/null)
+                ;;
+            --identifier|-t)
+                comps=$(journalctl -F 'SYSLOG_IDENTIFIER' 2>/dev/null)
+                ;;
+            --case-sensitive)
+                comps='yes no'
+                ;;
+            *)
+                return 0
+                ;;
+        esac
+        COMPREPLY=( $(compgen -o filenames -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ $cur = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    elif [[ $cur = *=* ]]; then
+        mapfile -t field_vals < <(journalctl -F "${prev%=}" 2>/dev/null)
+        COMPREPLY=( $(compgen -W '${field_vals[*]}' -- "${cur#=}") )
+    elif [[ $cur = /dev* ]]; then
+        compopt -o filenames
+        COMPREPLY=( $(compgen -f -- "${cur}") )
+    elif [[ $cur = /* ]]; then
+        # Append /dev/ to the list of completions, so that
+        # after typing /<TAB><TAB> the user sees /dev/ as one
+        # of the alternatives. Later on the rule above will
+        # take care of showing device files in /dev/.
+        mapfile -t field_vals < <(journalctl -F "_EXE" 2>/dev/null; echo '/dev/')
+        COMPREPLY=( $(compgen -W '${field_vals[*]}' -- "${cur}") )
+        if [[ "${COMPREPLY[@]}" = '/dev/' ]]; then
+            compopt -o filenames
+            COMPREPLY=( $(compgen -f -- "${cur}") )
+        fi
+    elif [[ $prev = '=' ]]; then
+        mapfile -t field_vals < <(journalctl -F "${COMP_WORDS[COMP_CWORD-2]}" 2>/dev/null)
+        COMPREPLY=( $(compgen -W '${field_vals[*]}' -- "$cur") )
+    else
+        mapfile -t field_vals < <(journalctl --fields 2>/dev/null)
+        compopt -o nospace
+        COMPREPLY=( $(compgen -W '${field_vals[*]}' -S= -- "$cur") )
+    fi
+}
+
+complete -F _journalctl journalctl
diff --git a/shell-completion/bash/kernel-install b/shell-completion/bash/kernel-install
new file mode 100644
index 0000000..4708777
--- /dev/null
+++ b/shell-completion/bash/kernel-install
@@ -0,0 +1,48 @@
+# kernel-install(8) completion                                   -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+_kernel_install() {
+    local comps
+    local MACHINE_ID
+    local cur=${COMP_WORDS[COMP_CWORD]}
+
+    case $COMP_CWORD in
+        1)
+            comps="add remove"
+            ;;
+        2)
+            comps=$(cd /lib/modules; echo [0-9]*)
+            if [[ ${COMP_WORDS[1]} == "remove" ]] && [[ -f /etc/machine-id ]]; then
+                read MACHINE_ID < /etc/machine-id
+                if [[ $MACHINE_ID ]] && ( [[ -d /boot/$MACHINE_ID ]] || [[ -L /boot/$MACHINE_ID ]] ); then
+                    comps=$(cd "/boot/$MACHINE_ID"; echo [0-9]*)
+                fi
+            fi
+            ;;
+        3)
+            [[ "$cur" ]] || cur=/lib/modules/${COMP_WORDS[2]}/vmlinuz
+            comps=$(compgen -f -- "$cur")
+            compopt -o filenames
+            ;;
+    esac
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _kernel_install kernel-install
diff --git a/shell-completion/bash/localectl b/shell-completion/bash/localectl
new file mode 100644
index 0000000..b601343
--- /dev/null
+++ b/shell-completion/bash/localectl
@@ -0,0 +1,96 @@
+# localectl(1) completion                                 -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# Copyright © 2010 Ran Benita
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__locale_fields=( LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME
+                  LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER
+                  LC_NAME LC_ADDRESS LC_TELEPHONE
+                  LC_MEASUREMENT LC_IDENTIFICATION )
+# LC_ALL is omitted on purpose
+
+_localectl() {
+    local i verb comps locale_vals
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local OPTS='-h --help --version --no-convert --no-pager --no-ask-password
+                    -H --host -M --machine'
+
+    if __contains_word "$prev" $OPTS; then
+        case $prev in
+            --host|-H)
+                comps=''
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ $cur = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    local -A VERBS=(
+        [STANDALONE]='status list-locales list-keymaps list-x11-keymap-models list-x11-keymap-layouts list-x11-keymap-options'
+        [VARIANTS]='list-x11-keymap-variants'
+        [LOCALES]='set-locale'
+        [KEYMAPS]='set-keymap'
+        [X11]='set-x11-keymap'
+    )
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if [[ -z ${verb-} ]]; then
+        comps=${VERBS[*]}
+    elif __contains_word "$verb" ${VERBS[VARIANTS]}; then
+        comps=$(command localectl list-x11-keymap-layouts)
+    elif __contains_word "$verb" ${VERBS[LOCALES]}; then
+        if [[ $cur = *=* ]]; then
+            mapfile -t locale_vals < <(command localectl list-locales 2>/dev/null)
+            COMPREPLY=( $(compgen -W '${locale_vals[*]}' -- "${cur#=}") )
+        elif [[ $prev = "=" ]]; then
+            mapfile -t locale_vals < <(command localectl list-locales 2>/dev/null)
+            COMPREPLY=( $(compgen -W '${locale_vals[*]}' -- "$cur") )
+        else
+            compopt -o nospace
+            COMPREPLY=( $(compgen -W '${__locale_fields[*]}' -S= -- "$cur") )
+        fi
+        return 0
+    elif __contains_word "$verb" ${VERBS[KEYMAPS]}; then
+        comps=$(command localectl list-keymaps)
+    elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[X11]}; then
+        comps=''
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _localectl localectl
diff --git a/shell-completion/bash/loginctl b/shell-completion/bash/loginctl
new file mode 100644
index 0000000..b307e42
--- /dev/null
+++ b/shell-completion/bash/loginctl
@@ -0,0 +1,125 @@
+# loginctl(1) completion                                  -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# Copyright © 2010 Ran Benita
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_all_sessions () { loginctl --no-legend list-sessions | { while read -r a b; do printf "%s\n" "$a"; done; } ; }
+__get_all_users    () { loginctl --no-legend list-users    | { while read -r a b; do printf "%s\n" "$b"; done; } ; }
+__get_all_seats    () { loginctl --no-legend list-seats    | { while read -r a b; do printf "%s\n" "$a"; done; } ; }
+
+__get_machines() {
+    local a b
+    { machinectl list --full --max-addresses=0 --no-legend --no-pager 2>/dev/null; echo ".host"; } | \
+	{ while read a b; do echo " $a"; done; } | \
+        sort -u
+}
+
+_loginctl () {
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local i verb comps
+
+    local -A OPTS=(
+        [STANDALONE]='--all -a --help -h --no-pager --version
+                      --no-legend --no-ask-password -l --full --value'
+        [ARG]='--host -H --kill-whom --property -p --signal -s -M --machine
+                      -n --lines -o --output -P'
+    )
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --signal|-s)
+                _signals
+                return
+                ;;
+            --kill-whom|--kill-who)
+                comps='all leader'
+                ;;
+            --host|-H)
+                comps=$(compgen -A hostname)
+                ;;
+            --machine|-M)
+                comps=$( __get_machines )
+                ;;
+            --property|-p|-P)
+                comps=''
+                ;;
+            --output|-o)
+                comps=$( loginctl --output=help 2>/dev/null )
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    local -A VERBS=(
+        [SESSIONS]='session-status show-session activate lock-session unlock-session terminate-session kill-session'
+        [USERS]='user-status show-user enable-linger disable-linger terminate-user kill-user'
+        [SEATS]='seat-status show-seat terminate-seat'
+        [STANDALONE]='list-sessions lock-sessions unlock-sessions list-users list-seats flush-devices'
+        [ATTACH]='attach'
+    )
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
+                ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if   [[ -z ${verb-} ]]; then
+        comps="${VERBS[*]}"
+
+    elif __contains_word "$verb" ${VERBS[SESSIONS]}; then
+        comps=$( __get_all_sessions )
+
+    elif __contains_word "$verb" ${VERBS[USERS]}; then
+        comps=$( __get_all_users )
+
+    elif __contains_word "$verb" ${VERBS[SEATS]}; then
+        comps=$( __get_all_seats )
+
+    elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
+        comps=''
+
+    elif __contains_word "$verb" ${VERBS[ATTACH]}; then
+        if [[ $prev = $verb ]]; then
+            comps=$( __get_all_seats )
+        else
+            comps=$(compgen -A file -- "$cur" )
+            compopt -o filenames
+        fi
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _loginctl loginctl
diff --git a/shell-completion/bash/machinectl b/shell-completion/bash/machinectl
new file mode 100644
index 0000000..b28769b
--- /dev/null
+++ b/shell-completion/bash/machinectl
@@ -0,0 +1,117 @@
+# machinectl(1) completion                      -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word() {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_machines() {
+    local a b
+    { machinectl list-images --full --no-legend --no-pager 2>/dev/null; machinectl list --full --max-addresses=0 --no-legend --no-pager 2>/dev/null; echo ".host"; } | \
+	{ while read a b; do echo " $a"; done; } | \
+        sort -u
+}
+
+_machinectl() {
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
+    local i verb comps
+
+    local -A OPTS=(
+        [STANDALONE]='--all -a -l --full --help -h --no-ask-password --no-legend --no-pager --version --value
+                      --mkdir --read-only --force -q --quiet'
+        [ARG]='--host -H --kill-whom -M --machine --property -p --signal -s --uid -E --setenv -n --lines
+                      -o --output --verify --format --max-addresses'
+    )
+
+    local -A VERBS=(
+        [STANDALONE]='list list-images clean pull-tar pull-raw list-transfers cancel-transfer import-fs'
+        [MACHINES]='status show start stop login shell enable disable poweroff reboot terminate kill bind
+                    copy-to copy-from image-status show-image clone rename read-only remove set-limit
+                    export-tar export-raw'
+        [FILE]='import-tar import-raw'
+    )
+
+    _init_completion || return
+
+    for ((i=0; i <= COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
+                ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --signal|-s)
+                _signals
+                return
+                ;;
+            --kill-whom|--kill-who)
+                comps='all leader'
+                ;;
+            --host|-H)
+                comps=$(compgen -A hostname)
+                ;;
+            --machine|-M)
+                comps=$( __get_machines )
+                ;;
+            --property|-p)
+                comps=''
+                ;;
+            --output|-o)
+                comps=$( machinectl --output=help 2>/dev/null )
+                ;;
+            --verify)
+                comps=$( machinectl --verify=help 2>/dev/null )
+                ;;
+            --format)
+                comps='uncompressed xz gzip bzip2'
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    if [[ -z ${verb-} ]]; then
+        comps=${VERBS[*]}
+
+    elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
+        comps=''
+
+    elif __contains_word "$verb" ${VERBS[MACHINES]}; then
+        comps=$( __get_machines )
+
+    elif __contains_word "$verb" ${VERBS[FILE]}; then
+        comps=$(compgen -f -- "cur")
+        compopt -o filenames
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _machinectl machinectl
diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
new file mode 100644
index 0000000..0446be7
--- /dev/null
+++ b/shell-completion/bash/meson.build
@@ -0,0 +1,57 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+bashcompletiondir = get_option('bashcompletiondir')
+if bashcompletiondir == ''
+        bash_completion = dependency('bash-completion', required : false)
+        if bash_completion.found()
+                bashcompletiondir = bash_completion.get_pkgconfig_variable('completionsdir')
+        else
+                bashcompletiondir = datadir / 'bash-completion/completions'
+        endif
+endif
+
+custom_target(
+        'systemctl',
+        input : 'systemctl.in',
+        output : 'systemctl',
+        command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
+        install : bashcompletiondir != 'no',
+        install_dir : bashcompletiondir)
+
+items = [['busctl',              ''],
+         ['journalctl',          ''],
+         ['systemd-analyze',     ''],
+         ['systemd-cat',         ''],
+         ['systemd-cgls',        ''],
+         ['systemd-cgtop',       ''],
+         ['systemd-delta',       ''],
+         ['systemd-detect-virt', ''],
+         ['systemd-id128',       ''],
+         ['systemd-nspawn',      ''],
+         ['systemd-path',        ''],
+         ['systemd-run',         ''],
+         ['udevadm',             ''],
+         ['bootctl',             'HAVE_GNU_EFI'],
+         ['coredumpctl',         'ENABLE_COREDUMP'],
+         ['homectl',             'ENABLE_HOMED'],
+         ['hostnamectl',         'ENABLE_HOSTNAMED'],
+         ['kernel-install',      'ENABLE_KERNEL_INSTALL'],
+         ['localectl',           'ENABLE_LOCALED'],
+         ['loginctl',            'ENABLE_LOGIND'],
+         ['machinectl',          'ENABLE_MACHINED'],
+         ['networkctl',          'ENABLE_NETWORKD'],
+         ['oomctl',              'ENABLE_OOMD'],
+         ['portablectl',         'ENABLE_PORTABLED'],
+         ['resolvectl',          'ENABLE_RESOLVE'],
+         ['systemd-cryptenroll', 'HAVE_LIBCRYPTSETUP'],
+         ['systemd-dissect',     'HAVE_BLKID'],
+         ['systemd-resolve',     'ENABLE_RESOLVE'],
+         ['systemd-sysext',      'ENABLE_SYSEXT'],
+         ['timedatectl',         'ENABLE_TIMEDATED']]
+
+foreach item : items
+        if bashcompletiondir != 'no' and (item[1] == '' or conf.get(item[1]) == 1)
+                install_data(item[0],
+                             install_dir : bashcompletiondir)
+        endif
+endforeach
diff --git a/shell-completion/bash/networkctl b/shell-completion/bash/networkctl
new file mode 100644
index 0000000..db59a9c
--- /dev/null
+++ b/shell-completion/bash/networkctl
@@ -0,0 +1,84 @@
+# networkctl(1) completion                               -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+    return 1
+}
+
+__get_links() {
+    networkctl list --no-legend --no-pager --all --full | { while read -r a b c; do echo " $b"; done; };
+}
+
+_networkctl() {
+    local i verb comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
+    local -A OPTS=(
+        [STANDALONE]='-a --all -h --help --version --no-pager --no-legend -s --stats -l --full'
+        [ARG]='-n --lines --json'
+    )
+
+    local -A VERBS=(
+        [STANDALONE]='label reload'
+        [LINKS]='status list lldp delete renew up down forcerenew reconfigure'
+    )
+
+    _init_completion || return
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
+                ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --json)
+                comps=$(networkctl --json=help | sort 2>/dev/null)
+                ;;
+            *)
+                return 0
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    if [[ -z ${verb-} ]]; then
+        comps=${VERBS[*]}
+    elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
+        comps=''
+    elif __contains_word "$verb" ${VERBS[LINKS]}; then
+        comps=$( __get_links )
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _networkctl networkctl
diff --git a/shell-completion/bash/oomctl b/shell-completion/bash/oomctl
new file mode 100644
index 0000000..dc45ba5
--- /dev/null
+++ b/shell-completion/bash/oomctl
@@ -0,0 +1,57 @@
+# oomctl(1) completion                               -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+_oomctl() {
+    local i verb comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local OPTS='-h --help --version --no-pager'
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    local -A VERBS=(
+        [STANDALONE]='help dump'
+    )
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if [[ -z ${verb-} ]]; then
+        comps=${VERBS[*]}
+    elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
+        comps=''
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _oomctl oomctl
diff --git a/shell-completion/bash/portablectl b/shell-completion/bash/portablectl
new file mode 100644
index 0000000..519c5c0
--- /dev/null
+++ b/shell-completion/bash/portablectl
@@ -0,0 +1,116 @@
+# portablectl(1) completion                             -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_machines() {
+    local a b
+    { machinectl list --full --max-addresses=0 --no-legend --no-pager 2>/dev/null; echo ".host"; } | \
+	{ while read a b; do echo " $a"; done; } | \
+        sort -u
+}
+
+_portablectl() {
+    local i n comps verb
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local -A OPTS=(
+        [STANDALONE]='-q --quiet --runtime --no-reload --cat --no-pager --no-legend
+                              --no-ask-password --enable --now -h --help --version'
+        [ARG]='-p --profile --copy -H --host -M --machine --extension'
+    )
+
+    local -A VERBS=(
+        [STANDALONE]='list'
+        [IMAGE]='attach detach reattach inspect is-attached set-limit'
+        [IMAGES]='remove'
+        [IMAGE_WITH_BOOL]='read-only'
+    )
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --profile|-p)
+                comps="default nonetwork strict trusted"
+                ;;
+            --copy)
+                comps="copy symlink auto"
+                ;;
+            --host|-H)
+                comps=$(compgen -A hostname)
+                ;;
+            --machine|-M)
+                comps=$( __get_machines )
+                ;;
+            --extension)
+                comps=$( compgen -A file -- "$cur" )
+                compopt -o filenames
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
+                ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    n=$(($COMP_CWORD - $i))
+
+    if [[ -z ${verb-} ]]; then
+        comps=${VERBS[*]}
+    elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
+        comps=''
+    elif __contains_word "$verb" ${VERBS[IMAGE]}; then
+        if [[ $n == 1 ]]; then
+            comps=$( compgen -A file -- "$cur" )
+            compopt -o filenames
+        else
+            comps=''
+        fi
+    elif __contains_word "$verb" ${VERBS[IMAGES]}; then
+        comps=$( compgen -A file -- "$cur" )
+        compopt -o filenames
+    elif __contains_word "$verb" ${VERBS[IMAGE_WITH_BOOL]}; then
+        if [[ $n == 1 ]]; then
+            comps=$( compgen -A file -- "$cur" )
+            compopt -o filenames
+        elif [[ $n == 2 ]]; then
+            comps='yes no'
+        else
+            comps=''
+        fi
+    fi
+
+    COMPREPLY=( $(compgen -o filenames -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _portablectl portablectl
diff --git a/shell-completion/bash/resolvectl b/shell-completion/bash/resolvectl
new file mode 100644
index 0000000..21f8014
--- /dev/null
+++ b/shell-completion/bash/resolvectl
@@ -0,0 +1,204 @@
+# resolvectl(1) completion                                  -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_interfaces(){
+    local name
+    for name in $(cd /sys/class/net && command ls); do
+        [[ "$name" != "lo" ]] && echo "$name"
+    done
+}
+
+_resolvectl() {
+    local i comps verb name
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version -4 -6 --legend=no --cname=no
+                      --validate=no --synthesize=no --cache=no --zone=no
+                      --trust-anchor=no --network=no --service-address=no
+                      --service-txt=no --search=no --no-pager'
+        [ARG]='-t --type -c --class -i --interface -p --protocol --raw'
+    )
+    local -A VERBS=(
+        [DOMAIN]='query service openpgp'
+        [FAMILY]='tlsa'
+        [STATUS]='status'
+        [LINK]='revert dns domain nta'
+        [BOOLEAN]='default-route'
+        [RESOLVE]='llmnr mdns'
+        [DNSSEC]='dnssec'
+        [DNSOVERTLS]='dnsovertls'
+        [STANDALONE]='statistics reset-statistics flush-caches reset-server-features'
+        [LOG_LEVEL]='log-level'
+    )
+    local -A ARGS=(
+        [FAMILY]='tcp udp sctp'
+        [BOOLEAN]='yes no'
+        [RESOLVE]='yes no resolve'
+        [DNSSEC]='yes no allow-downgrade'
+        [DNSOVERTLS]='yes no opportunistic'
+    )
+    local interfaces=$( __get_interfaces )
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --interface|-i)
+                comps="$interfaces"
+                ;;
+            --protocol|-p|--type|-t|--class|-c)
+                comps=$( resolvectl --legend=no "$prev" help; echo help )
+                ;;
+            --raw)
+                comps="payload packet"
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
+                ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if [[ -z ${verb-} ]]; then
+        comps="${VERBS[*]}"
+
+    elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[DOMAIN]}; then
+        comps=''
+
+    elif __contains_word "$verb" ${VERBS[STATUS]}; then
+        comps="$interfaces"
+
+    elif __contains_word "$verb" ${VERBS[LOG_LEVEL]}; then
+        comps='debug info notice warning err crit alert emerg'
+
+    elif __contains_word "$verb" ${VERBS[FAMILY]}; then
+        for ((i++; i < COMP_CWORD; i++)); do
+            if __contains_word "${COMP_WORDS[i]}" ${ARGS[FAMILY]} &&
+                    ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+                name=${COMP_WORDS[i]}
+                break;
+            fi
+        done
+        if [[ -z $name ]]; then
+            comps=${ARGS[FAMILY]}
+        else
+            comps=""
+        fi
+
+    elif __contains_word "$verb" ${VERBS[LINK]} ${VERBS[BOOLEAN]} ${VERBS[RESOLVE]} ${VERBS[DNSSEC]} ${VERBS[DNSOVERTLS]}; then
+        for ((i++; i < COMP_CWORD; i++)); do
+            if __contains_word "${COMP_WORDS[i]}" $interfaces &&
+                    ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+                name=${COMP_WORDS[i]}
+                break;
+            fi
+        done
+
+        if [[ -z $name ]]; then
+            comps="$interfaces"
+
+        elif __contains_word "$verb" ${VERBS[RESOLVE]}; then
+            name=
+            for ((i++; i < COMP_CWORD; i++)); do
+                if __contains_word "${COMP_WORDS[i]}" ${ARGS[RESOLVE]} &&
+                        ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+                    name=${COMP_WORDS[i]}
+                    break;
+                fi
+            done
+
+            if [[ -z $name ]]; then
+                comps=${ARGS[RESOLVE]}
+            else
+                comps=''
+            fi
+
+        elif __contains_word "$verb" ${VERBS[BOOLEAN]}; then
+            name=
+            for ((i++; i < COMP_CWORD; i++)); do
+                if __contains_word "${COMP_WORDS[i]}" ${ARGS[BOOLEAN]} &&
+                        ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+                    name=${COMP_WORDS[i]}
+                    break;
+                fi
+            done
+
+            if [[ -z $name ]]; then
+                comps=${ARGS[BOOLEAN]}
+            else
+                comps=''
+            fi
+
+        elif __contains_word "$verb" ${VERBS[DNSSEC]}; then
+            name=
+            for ((i++; i < COMP_CWORD; i++)); do
+                if __contains_word "${COMP_WORDS[i]}" ${ARGS[DNSSEC]} &&
+                        ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+                    name=${COMP_WORDS[i]}
+                    break;
+                fi
+            done
+
+            if [[ -z $name ]]; then
+                comps=${ARGS[DNSSEC]}
+            else
+                comps=''
+            fi
+
+        elif __contains_word "$verb" ${VERBS[DNSOVERTLS]}; then
+            name=
+            for ((i++; i < COMP_CWORD; i++)); do
+                if __contains_word "${COMP_WORDS[i]}" ${ARGS[DNSOVERTLS]} &&
+                        ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+                    name=${COMP_WORDS[i]}
+                    break;
+                fi
+            done
+
+            if [[ -z $name ]]; then
+                comps=${ARGS[DNSOVERTLS]}
+            else
+                comps=''
+            fi
+
+        else
+            comps=''
+        fi
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _resolvectl resolvectl
diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in
new file mode 100644
index 0000000..a926178
--- /dev/null
+++ b/shell-completion/bash/systemctl.in
@@ -0,0 +1,394 @@
+# systemctl(1) completion                                 -*- shell-script -*-
+# vi: ft=sh
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# Copyright © 2010 Ran Benita
+
+__systemctl() {
+    local mode=$1; shift 1
+    systemctl $mode --full --legend=no --no-pager --plain "$@" 2>/dev/null
+}
+
+__systemd_properties() {
+    {{ROOTLIBEXECDIR}}/systemd --dump-bus-properties
+}
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+{% raw -%}
+__filter_units_by_properties () {
+    local mode=$1 properties=$2; shift 2
+    local units=("$@")
+    local props i p n
+    local names= count=0
+
+    IFS=$',' read -r -a p < <(echo "Names,$properties")
+    n=${#p[*]}
+    readarray -t props < \
+              <(__systemctl $mode show --property "Names,$properties" -- "${units[@]}")
+
+    for ((i=0; i < ${#props[*]}; i++)); do
+        if [[ -z ${props[i]} ]]; then
+            if (( count == n )) && [[ -n $names ]]; then
+                echo $names
+            fi
+            names=
+            count=0
+        else
+            (( count++ ))
+            if [[ ${props[i]%%=*} == 'Names' ]]; then
+                names=${props[i]#*=}
+            fi
+        fi
+    done
+    if (( count == n )) && [[ -n $names ]]; then
+        echo $names
+    fi
+}
+{% endraw %}
+
+__get_all_units      () { { __systemctl $1 list-unit-files "$2*"; __systemctl $1 list-units --all "$2*"; } \
+                              | { while read -r a b; do echo " $a"; done; }; }
+__get_non_template_units() { { __systemctl $1 list-unit-files "$2*"; __systemctl $1 list-units --all "$2*"; } \
+                                 | { while read -r a b; do [[ $a =~ @\. ]] || echo " $a"; done; }; }
+__get_template_names () { __systemctl $1 list-unit-files "$2*" \
+                              | { while read -r a b; do [[ $a =~ @\. ]] && echo " ${a%%@.*}@"; done; }; }
+__get_active_units   () { __systemctl $1 list-units "$2*"      \
+                              | { while read -r a b; do echo " $a"; done; }; }
+__get_active_services() { __systemctl $1 list-units "$2*.service" \
+                              | { while read -r a b; do echo " $a"; done; }; }
+
+__get_not_masked_unit_files() {
+    # filter out masked, not-found, or template units.
+    __systemctl $1 list-unit-files --state enabled,enabled-runtime,linked,linked-runtime,static,indirect,disabled,generated,transient "$2*" | \
+        { while read -r a b; do [[ $a =~ @\. ]] || echo " $a"; done; }
+}
+
+__get_startable_units () {
+    __filter_units_by_properties $1 ActiveState=inactive,CanStart=yes $(
+        { __get_not_masked_unit_files $1 $2
+          # get inactive template units
+          __systemctl $1 list-units --state inactive,failed "$2*" | \
+              { while read -r a b c; do [[ $b == "loaded" ]] && echo " $a"; done; }
+        } | sort -u )
+}
+__get_restartable_units () {
+    # filter out masked and not-found
+    __filter_units_by_properties $1 CanStart=yes $(
+        { __get_not_masked_unit_files $1 $2
+          __get_active_units $1 $2
+        } | sort -u )
+}
+
+__get_stoppable_units () {
+    # filter out masked and not-found
+    local units=$(
+        { __get_not_masked_unit_files $1 $2
+          __get_active_units $1 $2
+        } | sort -u )
+    __filter_units_by_properties $1 ActiveState=active,CanStop=yes $units
+    __filter_units_by_properties $1 ActiveState=reloading,CanStop=yes $units
+    __filter_units_by_properties $1 ActiveState=activating,CanStop=yes $units
+}
+
+__get_reloadable_units () {
+    # filter out masked and not-found
+    __filter_units_by_properties $1 ActiveState=active,CanReload=yes $(
+        { __get_not_masked_unit_files $1 $2
+          __get_active_units $1 $2
+        } | sort -u )
+}
+
+__get_failed_units()   { __systemctl $1 list-units "$2*"      \
+                              | while read -r a b c d; do [[ $c == "failed" ]] && echo " $a"; done; }
+__get_enabled_units()  { __systemctl $1 list-unit-files "$2*" \
+                              | while read -r a b c  ; do [[ $b == "enabled" ]] && echo " $a"; done; }
+__get_disabled_units() { __systemctl $1 list-unit-files "$2*" \
+                              | while read -r a b c  ; do [[ $b == "disabled" ]] && echo " $a"; done; }
+__get_masked_units()   { __systemctl $1 list-unit-files "$2*" \
+                              | while read -r a b c  ; do [[ $b == "masked" ]] && echo " $a"; done; }
+__get_all_unit_files() { __systemctl $1 list-unit-files "$2*" | while read -r a b; do echo " $a"; done; }
+
+__get_machines() {
+    local a
+
+    while read a _; do
+        echo " $a"
+    done < <(machinectl list --full --max-addresses=0 --no-legend --no-pager 2>/dev/null | sort -u; echo ".host")
+}
+
+_systemctl () {
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local i verb comps mode cur_orig
+
+    local -A OPTS=(
+        [STANDALONE]='--all -a --reverse --after --before --defaults --force -f --full -l --global
+                             --help -h --no-ask-password --no-block --legend=no --no-pager --no-reload --no-wall --now
+                             --quiet -q --system --user --version --runtime --recursive -r --firmware-setup
+                             --show-types --plain --failed --value --fail --dry-run --wait'
+        [ARG]='--host -H --kill-whom --property -p --signal -s --type -t --state --job-mode --root
+                             --preset-mode -n --lines -o --output -M --machine --message --timestamp --check-inhibitors'
+    )
+
+    if __contains_word "--user" ${COMP_WORDS[*]}; then
+        mode=--user
+    elif __contains_word "--global" ${COMP_WORDS[*]}; then
+        mode=--user
+    else
+        mode=--system
+    fi
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --signal|-s)
+                _signals
+                return
+                ;;
+            --type|-t)
+                comps=$(__systemctl $mode -t help)
+                ;;
+            --state)
+                comps=$(__systemctl $mode --state=help)
+                ;;
+            --job-mode)
+                comps='fail replace replace-irreversibly isolate
+                                       ignore-dependencies ignore-requirements flush'
+                ;;
+            --kill-whom|--kill-who)
+                comps='all control main'
+                ;;
+            --root)
+                comps=$(compgen -A directory -- "$cur" )
+                compopt -o filenames
+                ;;
+            --host|-H)
+                comps=$(compgen -A hostname)
+                ;;
+            --property|-p)
+                comps=$(__systemd_properties)
+                ;;
+            --preset-mode)
+                comps='full enable-only disable-only'
+                ;;
+            --output|-o)
+                comps=$( systemctl --output=help 2>/dev/null )
+                ;;
+            --machine|-M)
+                comps=$( __get_machines )
+                ;;
+            --timestamp)
+                comps='pretty us µs utc us+utc µs+utc'
+                ;;
+            --check-inhibitors)
+                comps='auto yes no'
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    local -A VERBS=(
+        [ALL_UNITS]='cat mask'
+        [NONTEMPLATE_UNITS]='is-active is-failed is-enabled status show preset help list-dependencies edit set-property revert'
+        [ENABLED_UNITS]='disable'
+        [DISABLED_UNITS]='enable'
+        [REENABLABLE_UNITS]='reenable'
+        [FAILED_UNITS]='reset-failed'
+        [STARTABLE_UNITS]='start'
+        [STOPPABLE_UNITS]='stop condstop kill try-restart condrestart'
+        [ISOLATABLE_UNITS]='isolate'
+        [RELOADABLE_UNITS]='reload condreload try-reload-or-restart force-reload'
+        [RESTARTABLE_UNITS]='restart reload-or-restart'
+        [TARGET_AND_UNITS]='add-wants add-requires'
+        [MASKED_UNITS]='unmask'
+        [JOBS]='cancel'
+        [ENVS]='set-environment unset-environment import-environment'
+        [STANDALONE]='daemon-reexec daemon-reload default
+                             emergency exit halt hibernate hybrid-sleep
+                             suspend-then-hibernate kexec list-jobs list-sockets
+                             list-timers list-units list-unit-files poweroff
+                             reboot rescue show-environment suspend get-default
+                             is-system-running preset-all list-automounts'
+        [FILE]='link switch-root'
+        [TARGETS]='set-default'
+        [MACHINES]='list-machines'
+        [LOG_LEVEL]='log-level'
+        [LOG_TARGET]='log-target'
+        [SERVICE_LOG_LEVEL]='service-log-level'
+        [SERVICE_LOG_TARGET]='service-log-target'
+        [SERVICE_WATCHDOGS]='service-watchdogs'
+        [MOUNT]='bind mount-image'
+    )
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
+                ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    # When trying to match a unit name with certain special characters in its name (i.e
+    # foo\x2dbar:01) they get (un)escaped by bash along the way, thus causing any possible
+    # match to fail.
+    # The following condition solves two cases:
+    # 1) We're trying to complete an already escaped unit name part,
+    #    i.e foo\\x2dba. In this case we need to unescape the name, so it
+    #    gets properly matched with the systemctl output (i.e. foo\x2dba).
+    #    However, we need to keep the original escaped name as well for the
+    #    final match, as the completion machinery does the unescaping
+    #    automagically.
+    # 2) We're trying to complete an unescaped (literal) unit name part,
+    #    i.e. foo\x2dba. That means we don't have to do the unescaping
+    #    required for correct matching with systemctl's output, however,
+    #    we need to escape the name for the final match, where the completion
+    #    expects the string to be escaped.
+    cur_orig=$cur
+    if [[ $cur =~ '\\' ]]; then
+        cur="$(echo $cur | xargs echo)"
+    else
+        cur_orig="$(printf '%q' $cur)"
+    fi
+
+    if [[ -z ${verb-} ]]; then
+        comps="${VERBS[*]}"
+
+    elif __contains_word "$verb" ${VERBS[ALL_UNITS]}; then
+        comps=$( __get_all_units $mode "$cur" )
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[NONTEMPLATE_UNITS]}; then
+        comps=$( __get_non_template_units $mode "$cur" )
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[ENABLED_UNITS]}; then
+        comps=$( __get_enabled_units $mode "$cur" )
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[DISABLED_UNITS]}; then
+        comps=$( __get_disabled_units $mode "$cur";
+                 __get_template_names $mode "$cur")
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[REENABLABLE_UNITS]}; then
+        comps=$( __get_disabled_units $mode "$cur";
+                 __get_enabled_units $mode "$cur";
+                 __get_template_names $mode "$cur")
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then
+        comps=$( __get_startable_units $mode "$cur" )
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then
+        comps=$( __get_restartable_units $mode "$cur" )
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then
+        comps=$( __get_stoppable_units $mode "$cur" )
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[RELOADABLE_UNITS]}; then
+        comps=$( __get_reloadable_units $mode "$cur" )
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[ISOLATABLE_UNITS]}; then
+        comps=$( __filter_units_by_properties $mode AllowIsolate=yes \
+                                              $( __get_non_template_units $mode "$cur" ) )
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[FAILED_UNITS]}; then
+        comps=$( __get_failed_units $mode "$cur" )
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[MASKED_UNITS]}; then
+        comps=$( __get_masked_units $mode "$cur" )
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[TARGET_AND_UNITS]}; then
+        if __contains_word "$prev" ${VERBS[TARGET_AND_UNITS]} \
+                || __contains_word "$prev" ${OPTS[STANDALONE]}; then
+            comps=$( __systemctl $mode list-unit-files --type target --all "$cur*" \
+                         | { while read -r a b; do echo " $a"; done; } )
+        else
+            comps=$( __get_all_unit_files $mode "$cur" )
+        fi
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
+        comps=''
+
+    elif __contains_word "$verb" ${VERBS[JOBS]}; then
+        comps=$( __systemctl $mode list-jobs | { while read -r a b; do echo " $a"; done; } )
+
+    elif [ "$verb" = 'unset-environment' ]; then
+        comps=$( __systemctl $mode show-environment \
+                     | while read -r line; do echo " ${line%%=*}"; done )
+        compopt -o nospace
+
+    elif [ "$verb" = 'set-environment' ]; then
+        comps=$( __systemctl $mode show-environment \
+                     | while read -r line; do echo " ${line%%=*}="; done )
+        compopt -o nospace
+
+    elif [ "$verb" = 'import-environment' ]; then
+        COMPREPLY=( $(compgen -A variable -- "$cur_orig") )
+        return 0
+
+    elif __contains_word "$verb" ${VERBS[FILE]}; then
+        comps=$( compgen -A file -- "$cur" )
+        compopt -o filenames
+
+    elif __contains_word "$verb" ${VERBS[TARGETS]}; then
+        comps=$( __systemctl $mode list-unit-files --type target --full --all "$cur*" \
+                     | { while read -r a b; do echo " $a"; done; } )
+    elif __contains_word "$verb" ${VERBS[LOG_LEVEL]}; then
+        comps='debug info notice warning err crit alert emerg'
+    elif __contains_word "$verb" ${VERBS[LOG_TARGET]}; then
+        comps='console journal kmsg journal-or-kmsg null'
+    elif __contains_word "$verb" ${VERBS[SERVICE_LOG_LEVEL]}; then
+        if __contains_word "$prev" ${VERBS[SERVICE_LOG_LEVEL]}; then
+            comps=$( __get_all_unit_files $mode "$cur" )
+        elif __contains_word "$prev" debug info notice warning err crit alert emerg; then
+            return 0
+        else
+            comps='debug info notice warning err crit alert emerg'
+        fi
+    elif __contains_word "$verb" ${VERBS[SERVICE_LOG_TARGET]}; then
+        if __contains_word "$prev" ${VERBS[SERVICE_LOG_TARGET]}; then
+            comps=$( __get_all_unit_files $mode "$cur" )
+        elif __contains_word "$prev" console journal kmsg journal-or-kmsg null; then
+            return 0
+        else
+            comps='console journal kmsg journal-or-kmsg null'
+        fi
+    elif __contains_word "$verb" ${VERBS[SERVICE_WATCHDOGS]}; then
+        comps='on off'
+    elif __contains_word "$verb" ${VERBS[MOUNT]}; then
+        if __contains_word "$prev" ${VERBS[MOUNT]}; then
+            comps=$( __get_active_services $mode "$cur" )
+        elif [[ "$prev" =~ .service ]]; then
+            comps=$( compgen -A file -- "$cur" )
+            compopt -o filenames
+        else
+            return 0
+        fi
+    fi
+
+    COMPREPLY=( $(compgen -o filenames -W '$comps' -- "$cur_orig") )
+    return 0
+}
+
+complete -F _systemctl systemctl
diff --git a/shell-completion/bash/systemd-analyze b/shell-completion/bash/systemd-analyze
new file mode 100644
index 0000000..da38574
--- /dev/null
+++ b/shell-completion/bash/systemd-analyze
@@ -0,0 +1,204 @@
+# systemd-analyze(1) completion                      -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# Copyright © 2010 Ran Benita
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_machines() {
+    local a b
+    { machinectl list --full --max-addresses=0 --no-legend --no-pager 2>/dev/null; echo ".host"; } | \
+	{ while read a b; do echo " $a"; done; } | \
+        sort -u
+}
+
+__get_units_all() {
+    systemctl list-units --no-legend --no-pager --plain --all | \
+        { while read -r a b c; do echo " $a"; done }
+}
+
+__get_services() {
+    systemctl list-units --no-legend --no-pager --plain -t service --all $1 | \
+        { while read -r a b c; do [[ $b == "loaded" ]]; echo " $a"; done }
+}
+
+__get_syscall_sets() {
+    local line
+    systemd-analyze syscall-filter --no-pager | while IFS= read -r line; do
+        if [[ $line == @* ]]; then
+            printf '%s\n' "$line"
+        fi
+    done
+}
+
+_systemd_analyze() {
+    local i verb comps mode
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
+
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version --system --user --global --order --require --no-pager
+                             --man=no --generators=yes -q --quiet'
+        [ARG]='-H --host -M --machine --fuzz --from-pattern --to-pattern --root'
+    )
+
+    local -A VERBS=(
+        [STANDALONE]='time blame plot unit-paths exit-status calendar timestamp timespan'
+        [CRITICAL_CHAIN]='critical-chain'
+        [DOT]='dot'
+        [DUMP]='dump'
+        [VERIFY]='verify'
+        [SECCOMP_FILTER]='syscall-filter'
+        [CAT_CONFIG]='cat-config'
+        [SECURITY]='security'
+        [CONDITION]='condition'
+        [INSPECT_ELF]='inspect-elf'
+    )
+
+    local CONFIGS='systemd/bootchart.conf systemd/coredump.conf systemd/journald.conf
+                       systemd/journal-remote.conf systemd/journal-upload.conf systemd/logind.conf
+                       systemd/resolved.conf systemd/networkd.conf systemd/resolved.conf
+                       systemd/sleep.conf systemd/system.conf systemd/timedated.conf
+                       systemd/timesyncd.conf systemd/user.conf udev/udev.conf'
+
+    _init_completion || return
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
+                ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --host|-H)
+                comps=$(compgen -A hostname)
+                ;;
+            --machine|-M)
+                comps=$( __get_machines )
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ -z ${verb-}  && $cur = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    if [[ -z ${verb-} ]]; then
+        comps=${VERBS[*]}
+
+    elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
+        if [[ $cur = -* ]]; then
+            comps='--help --version --system --user --global --no-pager'
+        fi
+
+    elif __contains_word "$verb" ${VERBS[CRITICAL_CHAIN]}; then
+        if [[ $cur = -* ]]; then
+            comps='--help --version --system --user --fuzz --no-pager'
+        else
+            comps=$( __get_units_all )
+        fi
+
+    elif __contains_word "$verb" ${VERBS[DOT]}; then
+        if [[ $cur = -* ]]; then
+            comps='--help --version --system --user --global --from-pattern --to-pattern --order --require'
+        fi
+
+    elif __contains_word "$verb" ${VERBS[DUMP]}; then
+        if [[ $cur = -* ]]; then
+            comps='--help --version --system --user --no-pager'
+        else
+            comps=$( __get_units_all )
+        fi
+
+    elif __contains_word "$verb" ${VERBS[SECCOMP_FILTER]}; then
+        if [[ $cur = -* ]]; then
+            comps='--help --version --no-pager'
+        else
+            comps=$( __get_syscall_sets )
+        fi
+
+    elif __contains_word "$verb" ${VERBS[VERIFY]}; then
+        if [[ $cur = -* ]]; then
+            comps='--help --version --system --user --global --man=no --generators=yes --root --image --recursive-errors=no --recursive-errors=yes --recursive-errors=one'
+        else
+            comps=$( compgen -A file -- "$cur" )
+            compopt -o filenames
+        fi
+
+    elif __contains_word "$verb" ${VERBS[CAT_CONFIG]}; then
+        if [[ $cur = -* ]]; then
+            comps='--help --version --root --no-pager'
+        elif [[ -z $cur ]]; then
+            comps="$CONFIGS"
+            compopt -o filenames
+        else
+            comps="$CONFIGS $( compgen -A file -- "$cur" )"
+            compopt -o filenames
+        fi
+
+    elif __contains_word "$verb" ${VERBS[SECURITY]}; then
+        if [[ $cur = -* ]]; then
+            comps='--help --version --no-pager --system --user -H --host -M --machine --offline --threshold --security-policy --json=off --json=pretty --json=short --root --image --profile=default --profile=nonetwork --profile=strict --profile=trusted'
+        elif ! __contains_word "--offline" ${COMP_WORDS[*]}; then
+            if __contains_word "--user" ${COMP_WORDS[*]}; then
+                mode=--user
+            else
+                mode=--system
+            fi
+            comps=$( __get_services $mode )
+        else
+            comps="$CONFIGS $( compgen -A file -- "$cur" )"
+            compopt -o filenames
+        fi
+
+    elif __contains_word "$verb" ${VERBS[CONDITION]}; then
+        if [[ $cur = -* ]]; then
+            comps='--help --version --system --user --global --no-pager --root --image'
+        elif [[ $prev = "-u" ]] || [[ $prev = "--unit" ]]; then
+            if __contains_word "--user" ${COMP_WORDS[*]}; then
+                mode=--user
+            else
+                mode=--system
+            fi
+            comps=$( __get_services $mode )
+        fi
+
+    elif __contains_word "$verb" ${VERBS[INSPECT_ELF]}; then
+        if [[ $cur = -* ]]; then
+            comps='--help --version --json=off --json=pretty --json=short'
+        else
+            comps=$( compgen -A file -- "$cur" )
+            compopt -o filenames
+        fi
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _systemd_analyze systemd-analyze
diff --git a/shell-completion/bash/systemd-cat b/shell-completion/bash/systemd-cat
new file mode 100644
index 0000000..b209140
--- /dev/null
+++ b/shell-completion/bash/systemd-cat
@@ -0,0 +1,57 @@
+# systemd-cat(1) completion                  -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word() {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+_systemd_cat() {
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
+    local i verb comps
+
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version'
+        [ARG]='-t --identifier -p --priority --level-prefix'
+    )
+
+    _init_completion || return
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --identifier|-t)
+                comps=''
+                ;;
+            --priority|-p)
+                comps='emerg alert crit err warning notice info debug'
+                ;;
+            --level-prefix)
+                comps='yes no'
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+}
+
+complete -F _systemd_cat systemd-cat
diff --git a/shell-completion/bash/systemd-cgls b/shell-completion/bash/systemd-cgls
new file mode 100644
index 0000000..8dda5a8
--- /dev/null
+++ b/shell-completion/bash/systemd-cgls
@@ -0,0 +1,71 @@
+# systemd-cgls(1) completion                  -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word() {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_machines() {
+    local a b
+    { machinectl list --full --max-addresses=0 --no-legend --no-pager 2>/dev/null; echo ".host"; } | \
+	{ while read a b; do echo " $a"; done; } | \
+        sort -u
+}
+
+__get_units_have_cgroup() {
+    systemctl $1 --full --no-legend --no-pager --plain list-units | {
+        while read -r a b c d; do
+            [[ $c == "active" && ${a##*.} =~ (service|socket|mount|swap|slice|scope) ]] && echo " $a"
+        done
+    };
+}
+
+_systemd_cgls() {
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
+    local i verb comps
+
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version --all -l --full -k --no-pager --xattr=no --cgroup-id=no'
+        [ARG]='-M --machine -u --unit --user-unit'
+    )
+
+    _init_completion || return
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --machine|-M)
+                comps=$( __get_machines )
+                ;;
+            --unit|-u)
+                comps=$( __get_units_have_cgroup --system )
+                ;;
+            --user-unit)
+                comps=$( __get_units_have_cgroup --user )
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+}
+
+complete -F _systemd_cgls systemd-cgls
diff --git a/shell-completion/bash/systemd-cgtop b/shell-completion/bash/systemd-cgtop
new file mode 100644
index 0000000..731d9c9
--- /dev/null
+++ b/shell-completion/bash/systemd-cgtop
@@ -0,0 +1,68 @@
+# systemd-cgtop(1) completion                  -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word() {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_machines() {
+    local a b
+    { machinectl list --full --max-addresses=0 --no-legend --no-pager 2>/dev/null; echo ".host"; } | \
+	{ while read a b; do echo " $a"; done; } | \
+        sort -u
+}
+
+_systemd_cgtop() {
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
+    local comps
+
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version -p -t -c -m -i -b --batch -r --raw -k -P'
+        [ARG]='--cpu --depth -M --machine --recursive -n --iterations -d --delay --order'
+    )
+
+    _init_completion || return
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --machine|-M)
+                comps=$( __get_machines )
+                ;;
+            --recursive)
+                comps='yes no'
+                ;;
+            --order)
+                comps='path tasks cpu memory io'
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+    if [ -d /sys/fs/cgroup/systemd/ ]; then
+        COMPREPLY+=( $(cd /sys/fs/cgroup/systemd/ && compgen -o nospace -o dirnames "$cur") )
+    elif [ -d /sys/fs/cgroup/ ]; then
+        COMPREPLY+=( $(cd /sys/fs/cgroup/ && compgen -o nospace -o dirnames "$cur") )
+    fi
+}
+
+complete -F _systemd_cgtop systemd-cgtop
diff --git a/shell-completion/bash/systemd-cryptenroll b/shell-completion/bash/systemd-cryptenroll
new file mode 100644
index 0000000..5953814
--- /dev/null
+++ b/shell-completion/bash/systemd-cryptenroll
@@ -0,0 +1,110 @@
+# systemd-cryptenroll(1) completion                   -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word() {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_fido2_devices() {
+    local i
+    for i in /dev/hidraw*; do
+        [ -c "$i" ] && printf '%s\n' "$i"
+    done
+}
+
+__get_tpm2_devices() {
+    local i
+    for i in /dev/tpmrm*; do
+        [ -c "$i" ] && printf '%s\n' "$i"
+    done
+}
+
+__get_block_devices() {
+    local i
+    for i in /dev/*; do
+        [ -b "$i" ] && printf '%s\n' "$i"
+    done
+}
+
+_systemd-cryptenroll() {
+    local comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version
+                     --password --recovery-key'
+        [ARG]='--unlock-key-file
+               --pkcs11-token-uri
+               --fido2-credential-algorithm
+               --fido2-device
+               --fido2-with-client-pin
+               --fido2-with-user-presence
+               --fido2-with-user-verification
+               --tpm2-device
+               --tpm2-pcrs
+               --tpm2-public-key
+               --tpm2-public-key-pcrs
+               --tpm2-signature
+               --tpm2-with-pin
+               --wipe-slot'
+    )
+
+    _init_completion || return
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --unlock-key-file|--tpm2-public-key|--tpm2-signature)
+                comps=$(compgen -A file -- "$cur")
+                compopt -o filenames
+                ;;
+            --pkcs11-token-uri)
+                comps='auto list pkcs11:'
+                ;;
+            --fido2-credential-algorithm)
+                comps='es256 rs256 eddsa'
+                ;;
+            --fido2-device)
+                comps="auto list $(__get_fido2_devices)"
+                ;;
+            --fido2-with-client-pin|--fido2-with-user-presence|--fido2-with-user-verification|--tpm2-with-pin)
+                comps='yes no'
+                ;;
+            --tpm2-device)
+                comps="auto list $(__get_tpm2_devices)"
+                ;;
+            --wipe-slot)
+                comps='all empty password recovery pkcs11 fido2 tpm2'
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    comps=$(__get_block_devices)
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _systemd-cryptenroll systemd-cryptenroll
diff --git a/shell-completion/bash/systemd-delta b/shell-completion/bash/systemd-delta
new file mode 100644
index 0000000..b148755
--- /dev/null
+++ b/shell-completion/bash/systemd-delta
@@ -0,0 +1,60 @@
+# systemd-delta(1) completion                      -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word() {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+_systemd-delta() {
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
+    local comps
+
+    local -A OPTS=(
+        [STANDALONE]='--help -h --no-pager --version'
+        [ARG]='--diff --type -t'
+    )
+
+    _init_completion || return
+
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --diff)
+                comps='yes no'
+                ;;
+            --type|-t)
+                comps='masked equivalent redirected overridden unchanged extended default'
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]] || [[ -z ${comps-} ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    COMPREPLY=( $(compgen -W '${comps-}' -- "$cur") )
+    return 0
+}
+
+complete -F _systemd-delta systemd-delta
diff --git a/shell-completion/bash/systemd-detect-virt b/shell-completion/bash/systemd-detect-virt
new file mode 100644
index 0000000..05e4490
--- /dev/null
+++ b/shell-completion/bash/systemd-detect-virt
@@ -0,0 +1,40 @@
+# systemd-detect-virt(1) completion             -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word() {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+_systemd_detect_virt() {
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
+    local i verb comps
+
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version -c --container -v --vm -q --quiet
+                             --private-users'
+    )
+
+    _init_completion || return
+
+    COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+}
+
+complete -F _systemd_detect_virt systemd-detect-virt
diff --git a/shell-completion/bash/systemd-dissect b/shell-completion/bash/systemd-dissect
new file mode 100644
index 0000000..5e1ce05
--- /dev/null
+++ b/shell-completion/bash/systemd-dissect
@@ -0,0 +1,104 @@
+# systemd-dissect(1) completion                       -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word() {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+_systemd_dissect() {
+    local comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev_1=${COMP_WORDS[COMP_CWORD-1]} prev_2=${COMP_WORDS[COMP_CWORD-2]} words cword
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version
+                     --no-pager
+                     --no-legend
+                     -r --read-only
+                     --mkdir
+                     --rmdir'
+        [ARG]='-m --mount -M
+               -u --umount -U
+               -x --copy-from
+               -a --copy-to
+               --fsck
+               --growfs
+               --discard
+               --root-hash
+               --root-hash-sig
+               --verity-data
+               --json'
+    )
+
+    _init_completion || return
+
+    if __contains_word "$prev_1" ${OPTS[ARG]}; then
+        case $prev_1 in
+            -m|--mount|-M|-x|--copy-from|-a|--copy-to|--verity-data)
+                comps=$(compgen -A file -- "$cur")
+                compopt -o filenames
+                ;;
+            -u|--umount|-U)
+                comps=$(compgen -A directory -- "$cur" )
+                compopt -o dirnames
+                ;;
+            --fsck|--growfs)
+                comps='yes no'
+                ;;
+            --discard)
+                comps='disabled loop all crypto'
+                ;;
+            --root-hash-sig)
+                comps="base64: $(compgen -A file -- "$cur")"
+                compopt -o filenames
+                ;;
+            --json)
+                comps='pretty short off'
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if __contains_word "$prev_2" ${OPTS[ARG]}; then
+        case $prev_2 in
+            -m|--mount|-M)
+                comps=$(compgen -A directory -- "$cur" )
+                compopt -o dirnames
+                ;;
+            *)
+                comps=$(compgen -A file -- "$cur" )
+                compopt -o filenames
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    COMPREPLY=( $(compgen -A file -- "$cur") )
+    compopt -o filenames
+    return 0
+}
+
+complete -F _systemd_dissect systemd-dissect
diff --git a/shell-completion/bash/systemd-id128 b/shell-completion/bash/systemd-id128
new file mode 100644
index 0000000..1c19639
--- /dev/null
+++ b/shell-completion/bash/systemd-id128
@@ -0,0 +1,74 @@
+# systemd-id128(1) completion                         -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+    return 1
+}
+
+_systemd_id128() {
+    local i verb comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version -p --pretty'
+        [ARG]='-a --app-specific'
+    )
+
+    local -A VERBS=(
+        [STANDALONE]='new machine-id boot-id invocation-id help'
+    )
+
+    _init_completion || return
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --app-specific|-a)
+                comps=""
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
+                ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if [[ -z ${verb-} ]]; then
+        comps=${VERBS[*]}
+    elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
+        comps=''
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _systemd_id128 systemd-id128
diff --git a/shell-completion/bash/systemd-nspawn b/shell-completion/bash/systemd-nspawn
new file mode 100644
index 0000000..cc3d2f6
--- /dev/null
+++ b/shell-completion/bash/systemd-nspawn
@@ -0,0 +1,200 @@
+# systemd-nspawn(1) completion                  -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word() {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_users() {
+    local a b
+    loginctl list-users --no-legend --no-pager | { while read a b; do echo " $b"; done; };
+}
+
+__get_slices() {
+    local a b
+    systemctl list-units -t slice --no-legend --no-pager --plain | { while read a b; do echo " $a"; done; };
+}
+
+__get_machines() {
+    local a b
+    { machinectl list --full --max-addresses=0 --no-legend --no-pager 2>/dev/null; echo ".host"; } | \
+	{ while read a b; do echo " $a"; done; } | \
+        sort -u
+}
+
+__get_env() {
+    local a
+    env | { while read a; do echo " ${a%%=*}"; done; };
+}
+
+__get_interfaces(){
+    local name
+    for name in $(cd /sys/class/net && command ls); do
+        [[ "$name" != "lo" ]] && echo "$name"
+    done
+}
+
+__get_rlimit() {
+    local i
+    for i in $(systemd-nspawn --rlimit=help 2>/dev/null); do
+        echo " ${i}="
+    done
+}
+
+_systemd_nspawn() {
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
+    local i verb comps
+
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version --private-network -b --boot --read-only -q --quiet --share-system
+                      --keep-unit -n --network-veth -j -x --ephemeral -a --as-pid2 -U --suppress-sync=yes'
+        [ARG]='-D --directory -u --user --uuid --capability --drop-capability --link-journal --bind --bind-ro
+                      -M --machine -S --slice -E --setenv -Z --selinux-context -L --selinux-apifs-context
+                      --register --network-interface --network-bridge --personality -i --image --tmpfs
+                      --volatile --network-macvlan --kill-signal --template --notify-ready --root-hash --chdir
+                      --pivot-root --property --private-users --private-users-ownership --network-namespace-path
+                      --network-ipvlan --network-veth-extra --network-zone -p --port --system-call-filter --overlay
+                      --overlay-ro --settings --rlimit --hostname --no-new-privileges --oom-score-adjust --cpu-affinity
+                      --resolv-conf --timezone --root-hash-sig'
+    )
+
+    _init_completion || return
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --directory|-D|--template)
+                compopt -o nospace
+                comps=$(compgen -S/ -A directory -- "$cur" )
+                ;;
+            --user|-u)
+                comps=$( __get_users )
+                ;;
+            --uuid|--root-hash)
+                comps=''
+                ;;
+            --capability)
+                comps='CAP_BLOCK_SUSPEND CAP_IPC_LOCK CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_SYS_MODULE CAP_SYS_PACCT CAP_SYS_RAWIO
+                       CAP_SYS_TIME CAP_SYSLOG CAP_WAKE_ALARM CAP_NET_ADMIN'
+                ;;
+            --drop-capability)
+                comps='CAP_AUDIT_CONTROL CAP_AUDIT_WRITE CAP_CHOWN CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_FSETID
+                       CAP_IPC_OWNER CAP_KILL CAP_LEASE CAP_LINUX_IMMUTABLE CAP_MKNOD CAP_NET_ADMIN CAP_NET_BIND_SERVICE
+                       CAP_NET_BROADCAST CAP_NET_RAW CAP_SETFCAP CAP_SETGID CAP_SETPCAP CAP_SETUID CAP_SYS_ADMIN CAP_SYS_BOOT
+                       CAP_SYS_CHROOT CAP_SYS_NICE CAP_SYS_PTRACE CAP_SYS_RESOURCE CAP_SYS_TTY_CONFIG'
+                ;;
+            --link-journal)
+                comps='no auto guest try-guest host try-host'
+                ;;
+            --bind|--bind-ro)
+                compopt -o nospace -o filenames
+                comps=$(compgen -f -- "$cur" )
+                ;;
+            --tmpfs)
+                compopt -o nospace
+                comps=$(compgen -S/ -A directory -- "$cur" )
+                ;;
+            --machine|-M)
+                comps=$( __get_machines )
+                ;;
+            --slice|-S)
+                comps=$( __get_slices )
+                ;;
+            --setenv|-E)
+                comps=$( __get_env )
+                ;;
+            --selinux-context|-Z)
+                comps=''
+                ;;
+            --selinux-apifs-context|-L)
+                comps=''
+                ;;
+            --register)
+                comps='yes no'
+                ;;
+            --network-interface)
+                comps=$(__get_interfaces)
+                ;;
+            --network-bridge)
+                comps=''
+                ;;
+            --network-macvlan)
+                comps=''
+                ;;
+            --personality)
+                comps='x86 x86-64'
+                ;;
+            --volatile)
+                comps=$( systemd-nspawn --volatile=help 2>/dev/null )
+                ;;
+            --image|-i)
+                compopt -o nospace
+                comps=$( compgen -A file -- "$cur" )
+                ;;
+            --kill-signal)
+                _signals
+                return
+                ;;
+            --notify-ready)
+                comps='yes no'
+                ;;
+            --private-users)
+                comps='yes no pick'
+                ;;
+            --network-namespace-path)
+                comps=$( compgen -A file -- "$cur" )
+                ;;
+            --settings)
+                comps='yes no override trusted'
+                ;;
+            --rlimit)
+                comps=$( __get_rlimit )
+                ;;
+            --hostname)
+                comps=''
+                ;;
+            --no-new-privileges)
+                comps='yes no'
+                ;;
+            --oom-score-adjust)
+                comps=''
+                ;;
+            --cpu-affinity)
+                comps=''
+                ;;
+            --resolv-conf)
+                comps=$( systemd-nspawn --resolv-conf=help 2>/dev/null )
+                ;;
+            --timezone)
+                comps=$( systemd-nspawn --timezone=help 2>/dev/null )
+                ;;
+            --root-hash-sig)
+                compopt -o nospace
+                comps=$( compgen -A file -- "$cur" )
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+}
+
+complete -F _systemd_nspawn systemd-nspawn
diff --git a/shell-completion/bash/systemd-path b/shell-completion/bash/systemd-path
new file mode 100644
index 0000000..40e2f7e
--- /dev/null
+++ b/shell-completion/bash/systemd-path
@@ -0,0 +1,61 @@
+# systemd-path(1) completion                               -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+    return 1
+}
+
+__get_names() {
+    systemd-path | { while IFS=: read -r a b; do echo " $a"; done; }
+}
+
+_systemd_path() {
+    local comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version'
+        [ARG]='--suffix'
+    )
+
+    _init_completion || return
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --suffix)
+                comps=''
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    comps=$( __get_names )
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _systemd_path systemd-path
diff --git a/shell-completion/bash/systemd-resolve b/shell-completion/bash/systemd-resolve
new file mode 100644
index 0000000..20d904a
--- /dev/null
+++ b/shell-completion/bash/systemd-resolve
@@ -0,0 +1,80 @@
+# systemd-resolve(1) completion                             -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_interfaces(){
+    local name
+    for name in $(cd /sys/class/net && command ls); do
+        [[ "$name" != "lo" ]] && echo "$name"
+    done
+}
+
+_systemd-resolve() {
+    local i comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version --no-pager -4 -6
+                      --service --openpgp --tlsa --status --statistics
+                      --reset-statistics --service-address=no --service-txt=no
+                      --cname=no --search=no --legend=no --flush-caches
+                      --reset-server-features --revert'
+        [ARG]='-i --interface -p --protocol -t --type -c --class --raw
+                      --set-dns --set-domain --set-llmnr --set-mdns --set-dnssec --set-nta'
+    )
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --interface|-i)
+                comps=$( __get_interfaces )
+                ;;
+            --protocol|-p|--type|-t|--class|-c)
+                comps=$( systemd-resolve --legend=no "$prev" help; echo help )
+                ;;
+            --raw)
+                comps="payload packet"
+                ;;
+            --set-dns|--set-domain|--set-nta)
+                comps=""
+                ;;
+            --set-llmnr|--set-mdns)
+                comps="yes no resolve"
+                ;;
+            --set-dnssec)
+                comps="yes no allow-downgrade"
+                ;;
+            --set-dnsovertls)
+                comps="yes no opportunistic"
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]] || [[ -z ${comps-} ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+}
+
+complete -F _systemd-resolve systemd-resolve
diff --git a/shell-completion/bash/systemd-run b/shell-completion/bash/systemd-run
new file mode 100644
index 0000000..c18228d
--- /dev/null
+++ b/shell-completion/bash/systemd-run
@@ -0,0 +1,132 @@
+# systemd-run(1) completion                       -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__systemctl() {
+    local mode=$1; shift 1
+    systemctl $mode --full --no-legend --no-pager --plain "$@"
+}
+
+__get_slice_units () { __systemctl $1 list-units --all -t slice \
+                           | { while read -r a b c d; do echo " $a"; done; }; }
+
+__get_machines() {
+    local a b
+    { machinectl list --full --max-addresses=0 --no-legend --no-pager 2>/dev/null; echo ".host"; } | \
+	{ while read a b; do echo " $a"; done; } | \
+        sort -u
+}
+
+_systemd_run() {
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local OPTS='--no-ask-password --scope -u --unit -p --property --description --slice --slice-inherit
+                -r --remain-after-exit --send-sighup --service-type --uid --gid --nice
+                --working-directory -d --same-dir -E --setenv -t --pty -P --pipe -S --shell -q --quiet
+                --on-active --on-boot --on-startup --on-unit-active --on-unit-inactive --on-calendar
+                --on-clock-change --on-timezone-change --path-property --socket-property
+                --timer-property --no-block --wait -G --collect --user --system -H --host -M --machine
+                -h --help --version'
+
+    local mode=--system
+    local i
+    local opts_with_values=(
+        --unit -p --property --slice --description --service-type --uid --gid --nice --working-directory
+        -E --setenv --on-active --on-boot --on-startup --on-unit-active --on-unit-inactive --on-calendar
+        --path-property --socket-property --timer-property -H --host -M --machine
+    )
+    for (( i=1; i <= COMP_CWORD; i++ )); do
+        if [[ ${COMP_WORDS[i]} != -* ]]; then
+            local root_command=${COMP_WORDS[i]}
+            _command_offset $i
+            return
+        fi
+
+        [[ ${COMP_WORDS[i]} == "--user" ]] && mode=--user
+
+        [[ $i -lt $COMP_CWORD && " ${opts_with_values[@]} " =~ " ${COMP_WORDS[i]} " ]] && ((i++))
+    done
+
+    case "$prev" in
+        --unit|--description|--on-active|--on-boot|--on-startup|--on-unit-active|--on-unit-inactive|--on-calendar)
+            # argument required but no completions available
+            return
+            ;;
+        --slice)
+            local comps=$(__get_slice_units $mode)
+
+            COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+            return 0
+            ;;
+        --service-type)
+            local comps='simple forking oneshot dbus notify idle'
+
+            COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+            return 0
+            ;;
+        -p|--property)
+            local comps='CPUAccounting= MemoryAccounting= BlockIOAccounting= SendSIGHUP=
+                         SendSIGKILL= MemoryLimit= CPUShares= BlockIOWeight= User= Group=
+                         DevicePolicy= KillMode= ExitType= DeviceAllow= BlockIOReadBandwidth=
+                         BlockIOWriteBandwidth= BlockIODeviceWeight= Nice= Environment=
+                         KillSignal= RestartKillSignal= FinalKillSignal= LimitCPU= LimitFSIZE= LimitDATA=
+                         LimitSTACK= LimitCORE= LimitRSS= LimitNOFILE= LimitAS= LimitNPROC=
+                         LimitMEMLOCK= LimitLOCKS= LimitSIGPENDING= LimitMSGQUEUE=
+                         LimitNICE= LimitRTPRIO= LimitRTTIME= PrivateTmp= PrivateDevices=
+                         PrivateNetwork= NoNewPrivileges= WorkingDirectory= RootDirectory=
+                         TTYPath= SyslogIdentifier= SyslogLevelPrefix= SyslogLevel=
+                         SyslogFacility= TimerSlackNSec= OOMScoreAdjust= ReadWritePaths=
+                         ReadOnlyPaths= InaccessiblePaths= EnvironmentFile=
+                         ProtectSystem= ProtectHome= RuntimeDirectory= PassEnvironment='
+
+            COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+            return 0
+            ;;
+        -H|--host)
+            local comps=$(compgen -A hostname)
+
+            COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+            return 0
+            ;;
+        -M|--machine)
+            local comps=$( __get_machines )
+
+            COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+            return 0
+            ;;
+        --timer-property)
+            local comps='AccuracySec= WakeSystem='
+            COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+            return 0
+            ;;
+        --working-directory)
+            local comps
+            if [[ -z $cur ]]; then
+                comps=$(compgen -A directory -- "/" )
+            else
+                comps=$(compgen -A directory -- "$cur" )
+            fi
+            compopt -o filenames
+            COMPREPLY=( $(compgen -W '$comps' -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+    return 0
+}
+
+complete -F _systemd_run systemd-run
diff --git a/shell-completion/bash/systemd-sysext b/shell-completion/bash/systemd-sysext
new file mode 100644
index 0000000..b3f9f32
--- /dev/null
+++ b/shell-completion/bash/systemd-sysext
@@ -0,0 +1,85 @@
+# systemd-sysext(8) completion                        -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word() {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+_systemd-sysext() {
+    local i verb comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
+    local -A OPTS=(
+        [STANDALONE]='-h --help --version
+                     --no-pager
+                     --no-legend
+                     --force'
+        [ARG]='--root
+               --json'
+    )
+
+    local -A VERBS=(
+        [STANDALONE]='status
+                      merge
+                      unmerge
+                      refresh
+                      list'
+    )
+
+    _init_completion || return
+
+    if __contains_word "$prev" ${OPTS[ARG]}; then
+        case $prev in
+            --root)
+                comps=$(compgen -A directory -- "$cur" )
+                compopt -o dirnames
+                ;;
+            --json)
+                comps='pretty short off'
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ "$cur" = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
+                ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if [[ -z ${verb-} ]]; then
+        comps=${VERBS[*]}
+    elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
+        comps=''
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _systemd-sysext systemd-sysext
diff --git a/shell-completion/bash/timedatectl b/shell-completion/bash/timedatectl
new file mode 100644
index 0000000..768b4a5
--- /dev/null
+++ b/shell-completion/bash/timedatectl
@@ -0,0 +1,97 @@
+# timedatectl(1) completion                               -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# Copyright © 2010 Ran Benita
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_machines() {
+    local a b
+    { machinectl list --full --max-addresses=0 --no-legend --no-pager 2>/dev/null; echo ".host"; } | \
+	{ while read a b; do echo " $a"; done; } | \
+        sort -u
+}
+
+__get_interfaces(){
+    local name
+    for name in $(cd /sys/class/net && command ls); do
+        [[ "$name" != "lo" ]] && echo "$name"
+    done
+}
+_timedatectl() {
+    local i verb comps
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local OPTS='-h --help --version --adjust-system-clock --no-pager
+                --no-ask-password -H --host -M --machine --monitor
+                -p --property -a --all --value'
+
+    if __contains_word "$prev" $OPTS; then
+        case $prev in
+            --host|-H)
+                comps=$(compgen -A hostname)
+                ;;
+            --machine|-M)
+                comps=$( __get_machines )
+                ;;
+        esac
+        COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+        return 0
+    fi
+
+    if [[ $cur = -* ]]; then
+        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
+        return 0
+    fi
+
+    local -A VERBS=(
+        [BOOLEAN]='set-local-rtc set-ntp'
+        [STANDALONE]='status show list-timezones timesync-status show-timesync'
+        [TIMEZONES]='set-timezone'
+        [TIME]='set-time'
+        [IFNAME]='ntp-servers revert'
+    )
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]}; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if [[ -z ${verb-} ]]; then
+        comps=${VERBS[*]}
+    elif __contains_word "$verb" ${VERBS[BOOLEAN]}; then
+        comps='true false'
+    elif __contains_word "$verb" ${VERBS[TIMEZONES]}; then
+        comps=$(command timedatectl list-timezones)
+    elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[TIME]}; then
+        comps=''
+    elif __contains_word "$verb" ${VERBS[TIMEZONES]}; then
+        comps=$( __get_interfaces )
+    fi
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _timedatectl timedatectl
diff --git a/shell-completion/bash/udevadm b/shell-completion/bash/udevadm
new file mode 100644
index 0000000..99d4aa5
--- /dev/null
+++ b/shell-completion/bash/udevadm
@@ -0,0 +1,296 @@
+# udevadm(8) completion                                   -*- shell-script -*-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# Copyright © 2010 Ran Benita
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+__contains_word () {
+    local w word=$1; shift
+    for w in "$@"; do
+        [[ $w = "$word" ]] && return
+    done
+}
+
+__get_all_sysdevs() {
+    local -a devs=(/sys/bus/*/devices/*/ /sys/class/*/*/)
+    printf '%s\n' "${devs[@]%/}"
+}
+
+__get_all_devs() {
+    local i
+    for i in /dev/* /dev/*/* /dev/*/*/*; do
+        echo $i
+    done
+}
+
+__get_all_device_units() {
+    systemctl list-units -t device --full --no-legend --no-pager --plain 2>/dev/null | \
+        { while read -r a b; do echo "$a"; done; }
+}
+
+_udevadm() {
+    local i verb comps builtin
+    local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+    local -A OPTS=(
+        [COMMON]='-h --help -V --version'
+        [DEBUG]='-d --debug'
+        [INFO_STANDALONE]='-r --root -a --attribute-walk -x --export -e --export-db -c --cleanup-db
+                           -w --wait-for-initialization --value'
+        [INFO_ARG]='-q --query -p --path -n --name -P --export-prefix -d --device-id-of-file --property'
+        [TRIGGER_STANDALONE]='-v --verbose -n --dry-run -q --quiet -w --settle --wait-daemon --uuid
+                              --initialized-match --initialized-nomatch'
+        [TRIGGER_ARG]='-t --type -c --action -s --subsystem-match -S --subsystem-nomatch
+                       -a --attr-match -A --attr-nomatch -p --property-match
+                       -g --tag-match -y --sysname-match --name-match -b --parent-match
+                       --prioritized-subsystem'
+        [SETTLE]='-t --timeout -E --exit-if-exists'
+        [CONTROL_STANDALONE]='-e --exit -s --stop-exec-queue -S --start-exec-queue -R --reload --ping'
+        [CONTROL_ARG]='-l --log-priority -p --property -m --children-max -t --timeout'
+        [MONITOR_STANDALONE]='-k --kernel -u --udev -p --property'
+        [MONITOR_ARG]='-s --subsystem-match -t --tag-match'
+        [TEST]='-a --action -N --resolve-names'
+        [TEST_BUILTIN]='-a --action'
+        [WAIT]='-t --timeout --initialized=no --removed --settle'
+        [LOCK]='-t --timeout -d --device -b --backing -p --print'
+    )
+
+    local verbs=(info trigger settle control monitor test-builtin test wait lock)
+    local builtins=(blkid btrfs hwdb input_id keyboard kmod net_id net_setup_link path_id usb_id uaccess)
+
+    for ((i=0; i < COMP_CWORD; i++)); do
+        if __contains_word "${COMP_WORDS[i]}" "${verbs[@]}"; then
+            verb=${COMP_WORDS[i]}
+            break
+        fi
+    done
+
+    if [[ -z ${verb-} ]]; then
+        if [[ "$cur" = -* ]]; then
+            COMPREPLY=( $(compgen -W '${OPTS[COMMON]} ${OPTS[DEBUG]}' -- "$cur") )
+        else
+            COMPREPLY=( $(compgen -W '${verbs[*]}' -- "$cur") )
+        fi
+        return 0
+    fi
+
+    case $verb in
+        'info')
+            if __contains_word "$prev" ${OPTS[INFO_ARG]}; then
+                case $prev in
+                    -q|--query)
+                        comps='name symlink path property all'
+                        ;;
+                    -p|--path)
+                        comps=$( __get_all_sysdevs )
+                        local IFS=$'\n'
+                        ;;
+                    -n|--name)
+                        comps=$( __get_all_devs )
+                        ;;
+                    *)
+                        comps=''
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+            fi
+
+            if [[ $cur = -* ]]; then
+                comps="${OPTS[COMMON]} ${OPTS[INFO_STANDALONE]} ${OPTS[INFO_ARG]}"
+            else
+                comps=$( __get_all_sysdevs; __get_all_device_units )
+                local IFS=$'\n'
+            fi
+            ;;
+
+        'trigger')
+            if __contains_word "$prev" ${OPTS[TRIGGER_ARG]}; then
+                case $prev in
+                    -t|--type)
+                        comps='all devices subsystems'
+                        ;;
+                    -c|--action)
+                        comps=$( udevadm trigger --action help )
+                        ;;
+                    -y|--sysname-match|-b|--parent-match)
+                        comps=$( __get_all_sysdevs )
+                        local IFS=$'\n'
+                        ;;
+                    --name-match)
+                        comps=$( __get_all_devs )
+                        ;;
+                    *)
+                        comps=''
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+            fi
+
+            if [[ $cur = -* ]]; then
+                comps="${OPTS[COMMON]} ${OPTS[TRIGGER_STANDALONE]} ${OPTS[TRIGGER_ARG]}"
+            else
+                comps=$( __get_all_sysdevs; __get_all_device_units )
+                local IFS=$'\n'
+            fi
+            ;;
+
+        'settle')
+            if __contains_word "$prev" ${OPTS[SETTLE]}; then
+                case $prev in
+                    -E|--exit-if-exists)
+                        comps=$( compgen -A file -- "$cur" )
+                        ;;
+                    *)
+                        comps=''
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+            fi
+
+            comps="${OPTS[COMMON]} ${OPTS[SETTLE]}"
+            ;;
+
+        'control')
+            if __contains_word "$prev" ${OPTS[CONTROL_ARG]}; then
+                case $prev in
+                    -l|--log-priority)
+                        comps='alert crit debug emerg err info notice warning'
+                        ;;
+                    *)
+                        comps=''
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+            fi
+
+            comps="${OPTS[COMMON]} ${OPTS[CONTROL_STANDALONE]} ${OPTS[CONTROL_ARG]}"
+            ;;
+
+        'monitor')
+            if __contains_word "$prev" ${OPTS[MONITOR_ARG]}; then
+                case $prev in
+                    *)
+                        comps=''
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+            fi
+
+            comps="${OPTS[COMMON]} ${OPTS[MONITOR_STANDALONE]} ${OPTS[MONITOR_ARG]}"
+            ;;
+
+        'test')
+            if __contains_word "$prev" ${OPTS[TEST]}; then
+                case $prev in
+                    -a|--action)
+                        comps=$( udevadm test --action help )
+                        ;;
+                    -N|--resolve-names)
+                        comps='early late never'
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+            fi
+
+            if [[ $cur = -* ]]; then
+                comps="${OPTS[COMMON]} ${OPTS[TEST]}"
+            else
+                comps=$( __get_all_sysdevs )
+                local IFS=$'\n'
+            fi
+            ;;
+
+        'test-builtin')
+            if __contains_word "$prev" ${OPTS[TEST_BUILTIN]}; then
+                case $prev in
+                    -a|--action)
+                        comps=$( udevadm test-builtin --action help )
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+            fi
+
+            for ((i=0; i < COMP_CWORD; i++)); do
+                if __contains_word "${COMP_WORDS[i]}" "${builtins[@]}"; then
+                    builtin=${COMP_WORDS[i]}
+                    break
+                fi
+            done
+
+            if [[ -z $builtin ]]; then
+                comps="${builtins[@]}"
+            elif [[ $cur = -* ]]; then
+                comps="${OPTS[COMMON]} ${OPTS[TEST_BUILTIN]}"
+            else
+                comps=$( __get_all_sysdevs )
+                local IFS=$'\n'
+            fi
+            ;;
+
+        'wait')
+            if __contains_word "$prev" ${OPTS[WAIT]}; then
+                case $prev in
+                    *)
+                        comps=''
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+            fi
+
+            if [[ $cur = -* ]]; then
+                comps="${OPTS[COMMON]} ${OPTS[WAIT]}"
+            else
+                comps=$( __get_all_devs )
+                local IFS=$'\n'
+            fi
+            ;;
+
+        'lock')
+            if __contains_word "$prev" ${OPTS[LOCK]}; then
+                case $prev in
+                    *)
+                        comps=''
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+                return 0
+            fi
+
+            if [[ $cur = -* ]]; then
+                comps="${OPTS[COMMON]} ${OPTS[LOCK]}"
+            else
+                comps=''
+            fi
+            ;;
+
+        *)
+            comps=${VERBS[*]}
+            ;;
+    esac
+
+    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    return 0
+}
+
+complete -F _udevadm udevadm
diff --git a/shell-completion/zsh/_bootctl b/shell-completion/zsh/_bootctl
new file mode 100644
index 0000000..8634e8b
--- /dev/null
+++ b/shell-completion/zsh/_bootctl
@@ -0,0 +1,79 @@
+#compdef bootctl
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+__bootctl() {
+    bootctl --no-pager $@ 2>/dev/null
+}
+
+_bootctl_comp_ids() {
+    local expl
+    local -a ids
+    __bootctl list | while read a b; do
+        if [[ "$a" == "id:" ]]; then
+            ids+="$b"
+        fi
+    done
+    _wanted id expl 'boot id' compadd "$@" -a ids
+}
+
+_bootctl_set-default() {
+    _bootctl_comp_ids
+}
+
+_bootctl_set-oneshot() {
+    _bootctl_comp_ids
+}
+
+_bootctl_reboot-to-firmware() {
+    local -a _completions
+    _completions=( yes no )
+    typeset -U _completions
+   _describe 'possible values' _completions
+}
+
+(( $+functions[_bootctl_commands] )) || _bootctl_commands()
+{
+    local -a _bootctl_cmds
+    _bootctl_cmds=(
+        "status:Show status of installed systemd-boot and EFI variables"
+        "install:Install systemd-boot to the ESP and EFI variables"
+        "update:Update systemd-boot in the ESP and EFI variables"
+        "remove:Remove systemd-boot from the ESP and EFI variables"
+        "is-installed:Test whether systemd-boot is installed in the ESP"
+        "random-seed:Initialize random seed in ESP and EFI variables"
+        "systemd-efi-options:Query or set system options string in EFI variable"
+        "reboot-to-firmware:Query or set reboot-to-firmware EFI flag"
+        "list:List boot loader entries"
+        "set-default:Set the default boot loader entry"
+        "set-oneshot:Set the default boot loader entry only for the next boot"
+        "set-timeout:Set the menu timeout"
+        "set-timeout-oneshot:Set the menu timeout for the next boot only"
+    )
+    if (( CURRENT == 1 )); then
+        _describe -t commands 'bootctl command' _bootctl_cmds || compadd "$@"
+    else
+        local curcontext="$curcontext"
+        cmd="${${_bootctl_cmds[(r)$words[1]:*]%%:*}}"
+        if (( $+functions[_bootctl_$cmd] )); then
+            _bootctl_$cmd
+        else
+            _message "no more options"
+        fi
+    fi
+}
+
+_arguments \
+    {-h,--help}'[Prints a short help text and exits.]' \
+    '--version[Prints a short version string and exits.]' \
+    '--esp-path=[Path to the EFI System Partition (ESP)]:path:_directories' \
+    '--boot-path=[Path to the $BOOT partition]:path:_directories' \
+    {-p,--print-esp-path}'[Print path to the EFI system partition]' \
+    {-x,--print-boot-path}'[Print path to the $BOOT partition]' \
+    '--make-machine-id-directory=[Control creation and deletion of the top-level machine ID directory.]:options:(yes no auto)' \
+    '--no-variables[Do not touch EFI variables]' \
+    '--no-pager[Do not pipe output into a pager]' \
+    '--graceful[Do not fail when locating ESP or writing fails]' \
+    '--root=[Operate under the specified directory]:PATH' \
+    '--image=[Operate on the specified image]:PATH' \
+    '--install-source[Where to pick files when using --root=/--image=]:options:(image host auto)' \
+    '*::bootctl command:_bootctl_commands'
diff --git a/shell-completion/zsh/_busctl b/shell-completion/zsh/_busctl
new file mode 100644
index 0000000..b0cd4d5
--- /dev/null
+++ b/shell-completion/zsh/_busctl
@@ -0,0 +1,287 @@
+#compdef busctl
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# busctl(1) completion                               -*- shell-script -*-
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+(( $+functions[_busctl_commands] )) || _busctl_commands()
+{
+    local -a _busctl_cmds
+    _busctl_cmds=(
+        "list:List bus names"
+        "status:Show bus service, process or bus owner credentials"
+        "monitor:Show bus traffic"
+        "capture:Capture bus traffic"
+        "tree:Show object tree of service"
+        "introspect:Introspect object"
+        "call:Call a method"
+        "get-property:Get property value"
+        "set-property:Set property value"
+    )
+    if (( CURRENT == 1 )); then
+        _describe -t commands 'busctl command' _busctl_cmds || compadd "$@"
+    else
+        local curcontext="$curcontext"
+        cmd="${${_busctl_cmds[(r)$words[1]:*]%%:*}}"
+        curcontext="${curcontext%:*:*}:busctl-${cmd}:"
+        if (( $+functions[_busctl_$cmd] )); then
+            _busctl_$cmd
+        else
+            _message "no more options"
+        fi
+    fi
+}
+
+__busctl() {
+    busctl $_bus_address --no-pager --no-legend "$@" 2>/dev/null
+}
+
+__dbus_matchspec() {
+    # https://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-routing
+    _values -s, 'rules' \
+        'type[Match on message type]:type:(signal method_call method_return error)' \
+        'eavesdrop[Include unicast messages]:bool:(true false)' \
+        'sender[Match messages sent by a particular sender]:sender:{compadd $(_busctl_get_service_names)}'\
+        'interface[Match messages sent over or to a particular interface]:interface' \
+        'member[Match messages which have the given method or signal name]:member' \
+        'path[Match messages which are sent from or to the given object]:path' \
+        'path_namespace[Match messages which are sent from or to the given namespace]:namespace' \
+        'destination[Match messaged sent to the given unique name]:unique name:{compadd $(_busctl_get_unique_names)}'
+}
+
+(( $+functions[_busctl_get_json] )) || _busctl_get_json()
+{
+    local -a _json_forms
+    _json_forms=( $(__busctl --json=help; echo help) )
+    _values 'format' $_json_forms
+}
+
+(( $+functions[_busctl_get_service_names] )) || _busctl_get_service_names()
+{
+    local -a bus_names
+    bus_names=( $(__busctl call \
+        "org.freedesktop.DBus"  \
+        "/org/freedesktop/DBus" \
+        "org.freedesktop.DBus"  \
+        ListNames) )
+    echo ${(Q)bus_names[3,-1]}
+}
+
+(( $+functions[_busctl_get_unique_names] )) || _busctl_get_unique_names()
+{
+    local -a bus_names
+    local NAME OTHER
+    __busctl --unique list |
+    while read NAME OTHER; do
+        echo $NAME
+    done
+}
+
+(( $+functions[_busctl_get_objects] )) || _busctl_get_objects()
+{
+    local -a objects
+    local name="$1"
+    objects=($(__busctl --list tree $name ))
+    echo $objects
+}
+
+(( $+functions[_busctl_get_interfaces] )) || _busctl_get_interfaces()
+{
+    local NAME TYPE OTHER
+    __busctl introspect "$1" "$2" |
+    while read NAME TYPE OTHER; do
+        if [[ ${TYPE} == "interface" ]]; then
+            echo ${NAME}
+        fi
+    done
+}
+
+(( $+functions[_busctl_get_members] )) || _busctl_get_members()
+{
+    local member="$4"
+    local required="$5"
+    local NAME TYPE SIGNATURE VALUE FLAGS
+    __busctl introspect "$1" "$2" "$3" |
+    while read NAME TYPE SIGNATURE VALUE FLAGS; do
+        [[ -z "$member" || ${TYPE} == "$member" ]] &&
+        [[ -z "$required" || ${${(s: :)FLAGS}[-1]} == "$required" ]] &&
+        echo ${NAME#.}
+    done
+}
+
+(( $+functions[_busctl_get_signature] )) || _busctl_get_signature()
+{
+    local NAME TYPE SIGNATURE VALUE FLAGS
+    __busctl introspect "$1" "$2" "$3" |
+    while read NAME TYPE SIGNATURE VALUE FLAGS; do
+        if [[ ${NAME#.} == "$4" ]]; then
+            [[ ${SIGNATURE} != "-" ]] && echo ${SIGNATURE}
+        fi
+    done
+}
+
+(( $+functions[_busctl_status] )) || _busctl_status()
+{
+    local expl
+    _wanted busname expl 'busname' compadd "$@" - $(_busctl_get_service_names)
+}
+
+(( $+functions[_busctl_monitor] )) || _busctl_monitor()
+{
+    local expl
+    _wanted busname expl 'busname' compadd "$@" - $(_busctl_get_service_names)
+}
+
+(( $+functions[_busctl_tree] )) || _busctl_tree()
+{
+    local expl
+    _wanted busname expl 'busname' compadd "$@" - $(_busctl_get_service_names)
+}
+
+(( $+functions[_busctl_introspect] )) || _busctl_introspect()
+{
+    local expl
+    case $CURRENT in
+        2)
+            _wanted busname expl 'busname' \
+            compadd "$@" - $(_busctl_get_service_names)
+            ;;
+        3)
+            _wanted path expl 'path' \
+            compadd "$@" - $(_busctl_get_objects $words[2])
+            ;;
+        4)
+            _wanted interface expl 'interface' \
+            compadd "$@" - $(_busctl_get_interfaces $words[2,3])
+            ;;
+        *)
+            _message "no more options"
+    esac
+}
+
+(( $+functions[_busctl_call] )) || _busctl_call()
+{
+    local expl
+    case $CURRENT in
+        2)
+            _wanted busname expl 'busname' \
+            compadd "$@" - $(_busctl_get_service_names)
+            ;;
+        3)
+            _wanted path expl 'path' \
+            compadd "$@" - $(_busctl_get_objects $words[2])
+            ;;
+        4)
+            _wanted interface expl 'interface' \
+            compadd "$@" - $(_busctl_get_interfaces $words[2,3])
+            ;;
+        5)
+            _wanted method expl 'method' \
+            compadd "$@" - $(_busctl_get_members $words[2,4] "method")
+            ;;
+        6)
+            compadd "$@" - $(_busctl_get_signature $words[2,5])
+            ;;
+        *)
+            _message "no more options"
+    esac
+}
+
+(( $+functions[_busctl_get-property] )) || _busctl_get-property()
+{
+    local expl
+    case $CURRENT in
+        2)
+            _wanted busname expl 'busname' \
+            compadd "$@" - $(_busctl_get_service_names)
+            ;;
+        3)
+            _wanted path expl 'path' \
+            compadd "$@" - $(_busctl_get_objects $words[2])
+            ;;
+        4)
+            _wanted interface expl 'interface' \
+            compadd "$@" - $(_busctl_get_interfaces $words[2,3])
+            ;;
+        5)
+            _wanted property expl 'property' \
+            compadd "$@" - $(_busctl_get_members $words[2,4] "property")
+            ;;
+        *)
+            _message "no more options"
+    esac
+}
+
+(( $+functions[_busctl_set-property] )) || _busctl_set-property()
+{
+    local expl
+    case $CURRENT in
+        2)
+            _wanted busname expl 'busname' \
+            compadd "$@" - $(_busctl_get_service_names)
+            ;;
+        3)
+            _wanted path expl 'path' \
+            compadd "$@" - $(_busctl_get_objects $words[2])
+            ;;
+        4)
+            _wanted interface expl 'interface' \
+            compadd "$@" - $(_busctl_get_interfaces $words[2,3])
+            ;;
+        5)
+            _wanted property expl 'property' \
+            compadd "$@" - $(_busctl_get_members $words[2,4] "property" "writable")
+            ;;
+        6)
+            compadd "$@" - $(_busctl_get_signature $words[2,5])
+            ;;
+        *)
+            _message "no more options"
+    esac
+}
+
+local -a _modes; _modes=("--user" "--system")
+# Use the last mode (they are exclusive and the last one is used).
+local _bus_address=${${words:*_modes}[(R)(${(j.|.)_modes})]}
+local curcontext=$curcontext state line
+_arguments \
+    {-h,--help}'[Prints a short help text and exits.]' \
+    '--version[Prints a short version string and exits.]' \
+    '--no-pager[Do not pipe output into a pager]' \
+    '--no-legend[Do not show the headers and footers]' \
+    '--system[Connect to system manager]' \
+    '--user[Connect to user service manager]' \
+    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+    {-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \
+    '--address=[Connect to the bus specified by address]:address' \
+    '--show-machine[Show machine ID column in list]' \
+    '--unique[Only show unique names]' \
+    '--acquired[Only show acquired names]' \
+    '--activatable[Only show activatable names]' \
+    '--match=[Only show matching messages]:match:__dbus_matchspec' \
+    '--list[Do not show tree, but simple object path list]' \
+    {-q,--quiet}'[Do not show method call reply]'\
+    '--verbose[Show result values in long format]' \
+    '--xml-interface[Dump the XML description in introspect command]' \
+    '--json=[Show result values in long format]:format:_busctl_get_json' \
+    '-j[Show pretty json in interactive sessions, short json otherwise]' \
+    '--expect-reply=[Expect a method call reply]:boolean:(1 0)' \
+    '--auto-start=[Auto-start destination service]:boolean:(1 0)' \
+    '--allow-interactive-authorization=[Allow interactive authorization for operation]:boolean:(1 0)' \
+    '--timeout=[Maximum time to wait for method call completion]:timeout (seconds)' \
+    '--augment-creds=[Extend credential data with data read from /proc/$PID]:boolean:(1 0)' \
+    '*::busctl command:_busctl_commands'
diff --git a/shell-completion/zsh/_coredumpctl b/shell-completion/zsh/_coredumpctl
new file mode 100644
index 0000000..dad21a7
--- /dev/null
+++ b/shell-completion/zsh/_coredumpctl
@@ -0,0 +1,47 @@
+#compdef coredumpctl
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_coredumpctl_commands] )) ||
+_coredumpctl_commands(){
+    local -a _coredumpctl_cmds
+    _coredumpctl_cmds=(
+        'list:List available coredumps'
+        'info:Show detailed information about one or more coredumps'
+        'dump:Print coredump to stdout'
+        'debug:Start debugger (gdb) on a coredump'
+    )
+    if (( CURRENT == 1 )); then
+        _describe -t commands 'coredumpctl command' _coredumpctl_cmds
+    else
+        local curcontext="$curcontext"
+        local -a _dumps
+        cmd="${${_coredumpctl_cmds[(r)$words[1]:*]%%:*}}"
+        if (( $#cmd  )); then
+            _dumps=( "${(f)$(coredumpctl list -q --no-legend | awk 'BEGIN{OFS=":"} {sub(/[[ \t]+/, ""); print $4,$0}' 2>/dev/null)}" )
+            if [[ -n "$_dumps" ]]; then
+                _describe -V -t pids 'coredumps' _dumps
+            else
+                _message "no coredumps"
+            fi
+        else
+            _message "no more options"
+        fi
+    fi
+}
+
+_arguments \
+    {-o+,--output=}'[Write output to FILE]:output file:_files' \
+    {-F+,--field=}'[Show field in list output]:field' \
+    '-1[Show information about most recent entry only]' \
+    {-S,--since}'[Print entries since the specified date]' \
+    {-U,--until}'[Print entries until the specified date]' \
+    {-r,--reverse}'[Show the newest entries first]' \
+    '--no-pager[Do not pipe output into a pager]' \
+    '--no-legend[Do not print the column headers]' \
+    {-h,--help}'[Show this help]' \
+    '--version[Show package version]' \
+    '--debugger=[Use the given debugger]:debugger: _command_names -e' \
+    {-D,--directory=}'[Use the journal files in the specified dir]:directory: _directories' \
+    {-q,--quiet}'[Do not show info messages and privilege warning]' \
+    '--all[Look at all journal files instead of local ones]' \
+    '*::coredumpctl commands:_coredumpctl_commands'
diff --git a/shell-completion/zsh/_hostnamectl b/shell-completion/zsh/_hostnamectl
new file mode 100644
index 0000000..bdd26b1
--- /dev/null
+++ b/shell-completion/zsh/_hostnamectl
@@ -0,0 +1,95 @@
+#compdef hostnamectl
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_hostnamectl_hostname] )) ||
+_hostnamectl_hostname() {
+    if (( CURRENT <= 3 )); then
+        _message "new hostname"
+    else
+        _message "no more options"
+    fi
+}
+
+(( $+functions[_hostnamectl_icon-name] )) ||
+_hostnamectl_icon-name() {
+    if (( CURRENT <= 3 )); then
+        _message "new icon name"
+    else
+        _message "no more options"
+    fi
+}
+
+(( $+functions[_hostnamectl_chassis] )) ||
+_hostnamectl_chassis() {
+    if (( CURRENT <= 3 )); then
+        _chassis=( desktop laptop convertible server tablet handset watch embedded vm container )
+        _describe chassis _chassis
+    else
+        _message "no more options"
+    fi
+}
+
+(( $+functions[_hostnamectl_deployment] )) ||
+_hostnamectl_deployment() {
+    if (( CURRENT <= 3 )); then
+        _message "new environment"
+    else
+        _message "no more options"
+    fi
+}
+
+(( $+functions[_hostnamectl_location] )) ||
+_hostnamectl_location() {
+    if (( CURRENT <= 3 )); then
+        _message "new location"
+    else
+        _message "no more options"
+    fi
+}
+
+(( $+functions[_hostnamectl_commands] )) ||
+_hostnamectl_commands() {
+    local -a _hostnamectl_cmds
+    _hostnamectl_cmds=(
+        "status:Show current hostname settings"
+        "hostname:Get/set system hostname"
+        "icon-name:Get/set icon name for host"
+        "chassis:Get/set chassis type for host"
+        "deployment:Get/set deployment environment for host"
+        "location:Get/set location for host"
+    )
+    if (( CURRENT == 1 )); then
+        _describe -t commands 'hostnamectl commands' _hostnamectl_cmds || compadd "$@"
+    else
+        local curcontext="$curcontext"
+        cmd="${${_hostnamectl_cmds[(r)$words[1]:*]%%:*}}"
+        if (( $#cmd )); then
+            if [[ $cmd == status ]]; then
+                _message "no options"
+            else
+                _hostnamectl_$cmd
+            fi
+        else
+            _message "unknown hostnamectl command: $words[1]"
+        fi
+    fi
+}
+
+(( $+functions[_hostnamectl_get_json] )) || _hostnamectl_get_json()
+{
+    local -a _json_forms
+    _json_forms=( $(hostnamectl --json=help 2>/dev/null) )
+    _values 'format' $_json_forms
+}
+
+_arguments -s \
+    {-h,--help}'[Show this help]' \
+    '--version[Show package version]' \
+    '--transient[Only set transient hostname]' \
+    '--static[Only set static hostname]' \
+    '--pretty[Only set pretty hostname]' \
+    '--no-ask-password[Do not prompt for password]' \
+    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+    {-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \
+    '--json[Shows output formatted as JSON]:format:_hostnamectl_get_json' \
+    '*::hostnamectl commands:_hostnamectl_commands'
diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl
new file mode 100644
index 0000000..5dba1e7
--- /dev/null
+++ b/shell-completion/zsh/_journalctl
@@ -0,0 +1,144 @@
+#compdef journalctl
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_journalctl_fields] )) ||
+_journalctl_fields() {
+    local -a journal_fields
+    journal_fields=(MESSAGE{,_ID} PRIORITY CODE_{FILE,LINE,FUNC}
+                    ERRNO SYSLOG_{FACILITY,IDENTIFIER,PID}
+                    _{P,U,G}ID _COMM _EXE _CMDLINE
+                    _AUDIT_{SESSION,LOGINUID}
+                    _SYSTEMD_{CGROUP,SESSION,UNIT,OWNER_UID}
+                    _SYSTEMD_USER_UNIT USER_UNIT
+                    _SELINUX_CONTEXT _SOURCE_REALTIME_TIMESTAMP
+                    _{BOOT,MACHINE}_ID _HOSTNAME _TRANSPORT
+                    _KERNEL_{DEVICE,SUBSYSTEM}
+                    _UDEV_{SYSNAME,DEVNODE,DEVLINK}
+                    __CURSOR __{REALTIME,MONOTONIC}_TIMESTAMP)
+    case $_jrnl_none in
+        yes) _values -s '=' 'possible fields' \
+                "${journal_fields[@]}:value:_journalctl_field_values ${words[CURRENT]%%=*}" ;;
+        *)  _describe 'possible fields' journal_fields ;;
+    esac
+}
+
+(( $+functions[_journalctl_none] )) ||
+_journalctl_none() {
+    local -a _commands _files _jrnl_none
+    # Setting use-cache will slow this down considerably
+    _commands=( ${(f)"$(_call_program commands "$service $_sys_service_mgr -F _EXE" 2>/dev/null)"} )
+    _jrnl_none='yes'
+    _alternative : \
+        'files:/dev files:_files -W /dev -P /dev/' \
+        'commands:commands:compadd -a _commands' \
+        'fields:fields:_journalctl_fields'
+}
+
+(( $+functions[_journalctl_field_values] )) ||
+_journalctl_field_values() {
+    local -a _fields cmd
+    cmd=("journalctl $_sys_service_mgr" "-F ${@[-1]}" "2>/dev/null" )
+    _fields=$(_call_program fields $cmd[@])
+    _fields=${_fields//'\'/'\\'}
+    _fields=${_fields//':'/'\:'}
+    _fields=( ${(f)_fields} )
+    typeset -U _fields
+    _describe 'possible values' _fields
+}
+
+(( $+functions[_journalctl_boots] )) ||
+_journalctl_boots() {
+  local -a _bootid _previousboots
+  _bootid=( ${(f)"$(_call_program bootid "$service -F _BOOT_ID")"}  )
+  _previousboots=( -{1..${#_bootid}} )
+  _alternative : \
+    "offsets:boot offsets:compadd -a '_previousboots[1,-2]'" \
+    "bootid:boot ids:compadd -a _bootid"
+}
+
+(( $+functions[_journalctl_facilities] )) ||
+_journalctl_facilities() {
+  local -a _journalctl_facilities
+  _journalctl_facilities=(kern user mail daemon auth syslog lpr news uucp cron authpriv ftp local0 local1 local2 local3 local4 local5 local6 local7)
+  _describe 'possible values' _journalctl_facilities
+}
+
+# Build arguments for "journalctl" to be used in completion.
+# Use both --user and --system modes, they are not exclusive.
+local -a _modes; _modes=(--user --system)
+local -a _modes_with_arg; _modes_with_arg=(--directory -D --file -M --machine --root)
+typeset -a _sys_service_mgr
+local w k v i=0 n=$#words
+while (( i++ < n )); do
+    w=$words[$i]
+    if (( $_modes[(I)$w] )); then
+        _sys_service_mgr+=($w)
+    else
+        # Handle options with arguments. "--key=value" and "--key value".
+        k=${w%%=*}
+        if (( ${_modes_with_arg[(I)$k]} )); then
+            v=${w#*=}
+            if [[ "$k" != "$w" ]]; then
+                # "--key=value" style.
+                _sys_service_mgr+=($w)
+            else
+                # "--key value" style.
+                _sys_service_mgr+=($w ${words[((++i))]})
+            fi
+        fi
+    fi
+done
+_arguments -s \
+    {-h,--help}'[Show this help]' \
+    '--version[Show package version]' \
+    '--no-pager[Do not pipe output into a pager]' \
+    --no-hostname"[Don't show the hostname of local log messages]" \
+    {-l,--full}'[Show long fields in full]' \
+    {-a,--all}'[Show all fields, including long and unprintable]' \
+    {-f,--follow}'[Follow journal]' \
+    {-e,--pager-end}'[Jump to the end of the journal in the pager]' \
+    {-n+,--lines=}'[Number of journal entries to show]:integer' \
+    '--no-tail[Show all lines, even in follow mode]' \
+    {-r,--reverse}'[Reverse output]' \
+    {-o+,--output=}'[Change journal output mode]:output modes:_sd_outputmodes' \
+    {-x,--catalog}'[Show explanatory texts with each log line]' \
+    {-q,--quiet}"[Don't show privilege warning]" \
+    {-m,--merge}'[Show entries from all available journals]' \
+    {-b+,--boot=}'[Show data only from the specified boot or offset]::boot id or offset:_journalctl_boots' \
+    '--list-boots[List boots ordered by time]' \
+    {-k,--dmesg}'[Show only kernel messages from the current boot]' \
+    {-u+,--unit=}'[Show data only from the specified unit]:units:_journalctl_field_values _SYSTEMD_UNIT' \
+    '--user-unit=[Show data only from the specified user session unit]:units:_journalctl_field_values USER_UNIT' \
+    {-p+,--priority=}'[Show only messages within the specified priority range]:priority:_journalctl_field_values PRIORITY' \
+    '--facility=[Filter messages by facility]:facility:_journalctl_facilities' \
+    {-t+,--identifier=}'[Filter messages by syslog identifier]:identifier:_journalctl_field_values SYSLOG_IDENTIFIER' \
+    {-c+,--cursor=}'[Start showing entries from the specified cursor]:cursors:_journalctl_field_values __CURSORS' \
+    '--cursor-file=[Show entries using cursor store in file]:file:_files' \
+    '--after-cursor=[Start showing entries from after the specified cursor]:cursors:_journalctl_field_values __CURSORS' \
+    '--since=[Start showing entries on or newer than the specified date]:YYYY-MM-DD HH\:MM\:SS' \
+    '--until=[Stop showing entries on or older than the specified date]:YYYY-MM-DD HH\:MM\:SS' \
+    {-F,--field=}'[List all values a certain field takes]:Fields:_journalctl_fields' \
+    '--system[Show system and kernel messages]' \
+    '--user[Show messages from user services]' \
+    '(--directory -D -M --machine --root --file)'{-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \
+    '(--directory -D -M --machine --root --file)'{-D+,--directory=}'[Show journal files from directory]:directories:_directories' \
+    '(--directory -D -M --machine --root --file)--root=[Operate on catalog hierarchy under specified directory]:directories:_directories' \
+    '(--directory -D -M --machine --root)*--file=[Operate on specified journal files]:file:_files' \
+    '--disk-usage[Show total disk usage]' \
+    '--dump-catalog[Dump messages in catalog]' \
+    '--flush[Flush all journal data from /run into /var]' \
+    '--force[Force recreation of the FSS keys]' \
+    '--header[Show journal header information]' \
+    '--interval=[Time interval for changing the FSS sealing key]:time interval' \
+    '--list-catalog[List messages in catalog]' \
+    '--new-id128[Generate a new 128 Bit ID]' \
+    '--rotate[Request immediate rotation of the journal files]' \
+    '--setup-keys[Generate a new FSS key pair]' \
+    '--sync[Synchronize unwritten journal messages to disk]' \
+    '--update-catalog[Update binary catalog database]' \
+    '--vacuum-files=[Leave only the specified number of journal files]:integer' \
+    '--vacuum-size=[Reduce disk usage below specified size]:bytes' \
+    '--vacuum-time=[Remove journal files older than specified time]:time' \
+    '--verify-key=[Specify FSS verification key]:FSS key' \
+    '--verify[Verify journal file consistency]' \
+    '*::default: _journalctl_none'
diff --git a/shell-completion/zsh/_kernel-install b/shell-completion/zsh/_kernel-install
new file mode 100644
index 0000000..cb2565d
--- /dev/null
+++ b/shell-completion/zsh/_kernel-install
@@ -0,0 +1,27 @@
+#compdef kernel-install
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_kernel-install_images] )) ||
+_kernel-install_images(){
+    if [[ "$words[2]" == "remove" ]]; then
+        _message 'No more options'
+    else
+        _path_files -W /boot/ -P /boot/ -g "vmlinuz-*"
+    fi
+}
+
+(( $+functions[_kernel-install_kernels] )) ||
+_kernel-install_kernels(){
+    read _MACHINE_ID < /etc/machine-id
+    _kernel=( /lib/modules/[0-9]* )
+    if [[ "$cmd" == "remove" && -n "$_MACHINE_ID" ]]; then
+        _kernel=( "/boot/$_MACHINE_ID"/[0-9]* )
+    fi
+    _kernel=( ${_kernel##*/} )
+    _describe "installed kernels" _kernel
+}
+
+_arguments \
+    '1::add or remove:(add remove)' \
+    '2::kernel versions:_kernel-install_kernels' \
+    '3::kernel images:_kernel-install_images'
diff --git a/shell-completion/zsh/_localectl b/shell-completion/zsh/_localectl
new file mode 100644
index 0000000..65babe2
--- /dev/null
+++ b/shell-completion/zsh/_localectl
@@ -0,0 +1,98 @@
+#compdef localectl
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_localectl_set-locale] )) ||
+_localectl_set-locale() {
+    local -a _locales locale_fields
+    locale_fields=(LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME \
+                   LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER \
+                   LC_NAME LC_ADDRESS LC_TELEPHONE \
+                   LC_MEASUREMENT LC_IDENTIFICATION)
+    # LC_ALL is omitted on purpose
+
+    local expl suf
+    _locales=( ${(f)"$(_call_program locales "$service" list-locales)"} )
+    if [[ -prefix 1 *\= ]]; then
+        compset -P1 '*='
+        local conf=${PREFIX%%\=*}
+        _wanted locales expl "locales configs" \
+            _combination localeconfs  confs=$conf locales "$@" -
+    else
+        compadd -S '=' $locale_fields
+    fi
+}
+
+(( $+functions[_localectl_set-keymap] )) ||
+_localectl_set-keymap() {
+    local -a _keymaps
+    if (( CURRENT <= 3 )); then
+        _keymaps=( ${(f)"$(_call_program locales "$service" list-keymaps)"} )
+        _describe keymaps _keymaps
+    else
+        _message "no more options"
+    fi
+}
+
+(( $+functions[_localectl_set-x11-keymap] )) ||
+_localectl_set-x11-keymap() {
+    if (( $+commands[pkg-config] )); then
+        local -a _file _layout _model _variant _options
+        local _xorg_lst
+        _xorg_lst=${"$($commands[pkg-config] xkeyboard-config --variable=xkb_base)"}
+        _file=( ${(ps:\n\!:)"$(<$_xorg_lst/rules/base.lst)"} )
+        _layout=( ${${${(M)${(f)_file[2]}:#  *}#  }%% *} )
+        _model=( ${${${(M)${(f)_file[1]}:#  *}#  }%% *} )
+        _variant=( ${${${(M)${(f)_file[3]}:#  *}#  }%% *} )
+        _options=( ${${${(M)${(f)_file[4]}:#  *}#  }%% *} )
+        #_layout=( ${(f)"$( echo $_file[1] | awk '/^  / {print $1}' )"} )
+        #_model=( ${(f)"$(echo $_file[2] | awk '/^  / {print $1}')"} )
+        #_variant=( ${(f)"$(echo $_file[3] | awk '/^  / {print $1}')"} )
+        #_options=( ${(f)"$(echo ${_file[4]//:/\\:} | awk '/^  / {print $1}')"} )
+
+        case $CURRENT in
+            2) _describe layouts _layout ;;
+            3) _describe models _model;;
+            4) _describe variants _variant;;
+            5) _describe options _options;;
+            *) _message "no more options"
+        esac
+    fi
+}
+
+(( $+functions[_localectl_commands] )) ||
+_localectl_commands() {
+    local -a _localectl_cmds
+    _localectl_cmds=(
+        'status:Show current locale settings'
+        'set-locale:Set system locale'
+        'list-locales:Show known locales'
+        'set-keymap:Set virtual console keyboard mapping'
+        'list-keymaps:Show known virtual console keyboard mappings'
+        'set-x11-keymap:Set X11 keyboard mapping'
+        'list-x11-keymap-models:Show known X11 keyboard mapping models'
+        'list-x11-keymap-layouts:Show known X11 keyboard mapping layouts'
+        'list-x11-keymap-variants:Show known X11 keyboard mapping variants'
+        'list-x11-keymap-options:Show known X11 keyboard mapping options'
+    )
+    if (( CURRENT == 1 )); then
+        _describe -t commands 'localectl command' _localectl_cmds
+    else
+        local curcontext="$curcontext"
+        cmd="${${_localectl_cmds[(r)$words[1]:*]%%:*}}"
+        if (( $+functions[_localectl_$cmd] )); then
+            _localectl_$cmd
+        else
+            _message "unknown localectl command: $words[1]"
+        fi
+    fi
+}
+
+_arguments \
+    {-h,--help}'[Show this help]' \
+    '--version[Show package version]' \
+    "--no-convert[Don't convert keyboard mappings]" \
+    '--no-pager[Do not pipe output into a pager]' \
+    '--no-ask-password[Do not prompt for password]' \
+    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+    {-M+,--machine=}'[Operate on local container]:machine' \
+    '*::localectl commands:_localectl_commands'
diff --git a/shell-completion/zsh/_loginctl b/shell-completion/zsh/_loginctl
new file mode 100644
index 0000000..5473020
--- /dev/null
+++ b/shell-completion/zsh/_loginctl
@@ -0,0 +1,182 @@
+#compdef loginctl
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_loginctl_all_sessions] )) ||
+_loginctl_all_sessions() {
+    local session description
+    loginctl --no-legend list-sessions | while read -r session description; do
+        _sys_all_sessions+=( "$session" )
+        _sys_all_sessions_descr+=( "${session}:$description" )
+    done
+}
+
+(( $+functions[_loginctl_all_users] )) ||
+_loginctl_all_users() {
+    local uid description
+    loginctl --no-legend list-users | while read -r uid description; do
+        _sys_all_users+=( "$uid" )
+        _sys_all_users_descr+=( "${uid}:$description" )
+    done
+}
+
+(( $+functions[_loginctl_all_seats] )) ||
+_loginctl_all_seats() {
+    local seat description
+    loginctl --no-legend list-seats | while read -r seat description; do
+        _sys_all_seats+=( "$seat" )
+        _sys_all_seats_descr+=( "${seat}:$description" )
+    done
+}
+
+local fun
+# Completion functions for SESSIONS
+for fun in session-status show-session activate lock-session unlock-session terminate-session kill-session ; do
+    (( $+functions[_loginctl_$fun] )) ||
+_loginctl_$fun() {
+    local -a _sys_all_sessions{,_descr}
+
+	_sys_all_sessions=( "self" )
+	_sys_all_sessions_descr=( "self:alias for the current session" )
+
+    _loginctl_all_sessions
+    for _ignore in $words[2,-1]; do
+        _sys_all_sessions[(i)$_ignore]=()
+        _sys_all_sessions_descr[(i)$_ignore:*]=()
+    done
+
+    if zstyle -T ":completion:${curcontext}:systemd-sessions" verbose; then
+        _describe -t systemd-sessions session _sys_all_sessions_descr _sys_all_sessions "$@"
+    else
+        local expl
+        _wanted systemd-sessions expl session compadd "$@" -a _sys_all_sessions
+    fi
+}
+done
+
+# Completion functions for USERS
+for fun in user-status show-user enable-linger disable-linger terminate-user kill-user ; do
+    (( $+functions[_loginctl_$fun] )) ||
+_loginctl_$fun() {
+    local -a _sys_all_users{,_descr}
+    zstyle -a ":completion:${curcontext}:users" users _sys_all_users
+
+    if ! (( $#_sys_all_users )); then
+        _loginctl_all_users
+    fi
+
+    for _ignore in $words[2,-1]; do
+        _sys_all_users[(i)$_ignore]=()
+        _sys_all_users_descr[(i)$_ignore:*]=()
+    done
+
+    # using the common tag `users' here, not rolling our own `systemd-users' tag
+    if zstyle -T ":completion:${curcontext}:users" verbose; then
+        _describe -t users user ${_sys_all_users_descr:+_sys_all_users_descr} _sys_all_users "$@"
+    else
+        local expl
+        _wanted users expl user compadd "$@" -a _sys_all_users
+    fi
+}
+done
+
+# Completion functions for SEATS
+(( $+functions[_loginctl_seats] )) ||
+_loginctl_seats() {
+    local -a _sys_all_seats{,_descr}
+
+	_sys_all_seats=( "self" )
+	_sys_all_seats_descr=( "self:alias for the current seat" )
+
+    _loginctl_all_seats
+    for _ignore in $words[2,-1]; do
+        _sys_all_seats[(i)$_ignore]=()
+        _sys_all_seats_descr[(i)$_ignore:*]=()
+    done
+
+    if zstyle -T ":completion:${curcontext}:systemd-seats" verbose; then
+        _describe -t systemd-seats seat _sys_all_seats_descr _sys_all_seats "$@"
+    else
+        local expl
+        _wanted systemd-seats expl seat compadd "$@" -a _sys_all_seats
+    fi
+}
+for fun in seat-status show-seat terminate-seat ; do
+    (( $+functions[_loginctl_$fun] )) ||
+_loginctl_$fun() { _loginctl_seats }
+done
+
+# Completion functions for ATTACH
+(( $+functions[_loginctl_attach] )) ||
+_loginctl_attach() {
+    _arguments -w -C -S -s \
+               ':seat:_loginctl_seats' \
+               '*:device:_files'
+}
+
+# no loginctl completion for:
+# [STANDALONE]='list-sessions list-users list-seats flush-devices'
+
+(( $+functions[_loginctl_commands] )) ||
+_loginctl_commands() {
+    local -a _loginctl_cmds
+    _loginctl_cmds=(
+        "list-sessions:List sessions"
+        "session-status:Show session status"
+        "show-session:Show properties of one or more sessions"
+        "activate:Activate a session"
+        "lock-session:Screen lock one or more sessions"
+        "unlock-session:Screen unlock one or more sessions"
+        "lock-sessions:Screen lock all current sessions"
+        "unlock-sessions:Screen unlock all current sessions"
+        "terminate-session:Terminate one or more sessions"
+        "kill-session:Send signal to processes of a session"
+        "list-users:List users"
+        "user-status:Show user status"
+        "show-user:Show properties of one or more users"
+        "enable-linger:Enable linger state of one or more users"
+        "disable-linger:Disable linger state of one or more users"
+        "terminate-user:Terminate all sessions of one or more users"
+        "kill-user:Send signal to processes of a user"
+        "list-seats:List seats"
+        "seat-status:Show seat status"
+        "show-seat:Show properties of one or more seats"
+        "attach:Attach one or more devices to a seat"
+        "flush-devices:Flush all device associations"
+        "terminate-seat:Terminate all sessions on one or more seats"
+    )
+
+    if (( CURRENT == 1 )); then
+        _describe -t commands 'loginctl command' _loginctl_cmds || compadd "$@"
+    else
+        local curcontext="$curcontext" _ignore
+
+        cmd="${${_loginctl_cmds[(r)$words[1]:*]%%:*}}"
+
+        if (( $#cmd )); then
+            curcontext="${curcontext%:*:*}:loginctl-${cmd}:"
+
+            _call_function ret _loginctl_$cmd || _message 'no more arguments'
+        else
+            _message "unknown loginctl command: $words[1]"
+        fi
+        return ret
+    fi
+}
+
+
+_arguments -s \
+    {-h,--help}'[Show help]' \
+    '--version[Show package version]' \
+    \*{-p+,--property=}'[Show only properties by this name]:unit property' \
+    {-a,--all}'[Show all properties, including empty ones]' \
+    '--kill-whom=[Whom to send signal to]:killwhom:(main control all)' \
+    {-s+,--signal=}'[Which signal to send]:signal:_signals' \
+    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+    {-M+,--machine=}'[Operate on local container]:machine:_sd_machines' \
+    {-l,--full}'[Do not ellipsize output]' \
+    '--no-pager[Do not pipe output into a pager]' \
+    '--no-legend[Do not show the headers and footers]' \
+    '--no-ask-password[Do not ask for system passwords]' \
+    {-n+,--lines=}'[Number of journal entries to show]' \
+    {-o+,--output=}'[Change journal output mode]:output modes:_sd_outputmodes' \
+    '*::loginctl command:_loginctl_commands'
diff --git a/shell-completion/zsh/_machinectl b/shell-completion/zsh/_machinectl
new file mode 100644
index 0000000..2b675bd
--- /dev/null
+++ b/shell-completion/zsh/_machinectl
@@ -0,0 +1,106 @@
+#compdef machinectl
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[__machinectl_get_images] )) ||
+    __machinectl_get_images () {
+        machinectl --no-legend list-images | {while read -r a b; do echo $a; done;}
+    }
+
+(( $+functions[_machinectl_images] )) ||
+    _machinectl_images() {
+        local -a _machines
+        _machines=("${(fo)$(__machinectl_get_images)}")
+        typeset -U _machines
+        if [[ -n "$_machines" ]]; then
+            _describe 'machines' _machines
+        else
+            _message 'no machines'
+        fi
+    }
+
+(( $+functions[_machinectl_commands] )) || _machinectl_commands()
+{
+    local -a _machinectl_cmds
+    _machinectl_cmds=(
+        "list:List currently running VMs/containers"
+        "status:Show VM/container status"
+        "show:Show properties of one or more VMs/containers"
+        "start:Start container as a service"
+        "stop:Stop container (equal to poweroff)"
+        "login:Get a login prompt on a VM/container"
+        "shell:Invoke a shell (or other command) in a container"
+        "enable:Enable automatic container start at boot"
+        "disable:Disable automatic container start at boot"
+        "poweroff:Power off one or more VMs/containers"
+        "reboot:Reboot one or more VMs/containers"
+        "terminate:Terminate one or more VMs/containers"
+        "kill:Send signal to process or a VM/container"
+        "copy-to:Copy files from the host to a container"
+        "copy-from:Copy files from a container to the host"
+        "bind:Bind mount a path from the host into a container"
+
+        "list-images:Show available container and VM images"
+        "image-status:Show image details"
+        "show-image:Show properties of image"
+        "clone:Clone an image"
+        "rename:Rename an image"
+        "read-only:Mark or unmark image read-only"
+        "remove:Remove an image"
+
+        "pull-tar:Download a TAR container image"
+        "pull-raw:Download a RAW container or VM image"
+        "list-transfers:Show list of downloads in progress"
+        "cancel-transfer:Cancel a download"
+    )
+
+    if (( CURRENT == 1 )); then
+        _describe -t commands 'machinectl command' _machinectl_cmds || compadd "$@"
+    else
+        local curcontext="$curcontext"
+        cmd="${${_machinectl_cmds[(r)$words[1]:*]%%:*}}"
+        if (( $#cmd )); then
+            if (( CURRENT == 2 )); then
+                case $cmd in
+                    list*|cancel-transfer|pull-tar|pull-raw)
+                        msg="no options" ;;
+                    clone)
+                        _machinectl_images ;;
+                    start)
+                        _machinectl_images ;;
+                    *)
+                        _sd_machines
+                esac
+            else
+                case $cmd in
+                    copy-to|copy-from|bind)
+                        _files ;;
+                    *) msg="no options"
+                esac
+            fi
+        else
+            _message "no more options"
+        fi
+    fi
+}
+
+_arguments \
+    {-h,--help}'[Prints a short help text and exits.]' \
+    '--version[Prints a short version string and exits.]' \
+    '--no-pager[Do not pipe output into a pager.]' \
+    '--no-legend[Do not show the headers and footers.]' \
+    '--no-ask-password[Do not ask for system passwords.]' \
+    {-H+,--host=}'[Operate on remote host.]:userathost:_sd_hosts_or_user_at_host' \
+    {-M+,--machine=}'[Operate on local container.]:machine:_sd_machines' \
+    {-p+,--property=}'[Limit output to specified property.]:property:(Name Id Timestamp TimestampMonotonic Service Scope Leader Class State RootDirectory)' \
+    {-a,--all}'[Show all properties.]' \
+    {-q,--quiet}'[Suppress output.]' \
+    {-l,--full}'[Do not ellipsize cgroup members.]' \
+    '--kill-whom=[Whom to send signal to.]:killwhom:(leader all)' \
+    {-s+,--signal=}'[Which signal to send.]:signal:_signals' \
+    '--read-only[Create read-only bind mount.]' \
+    '--mkdir[Create directory before bind mounting, if missing.]' \
+    {-n+,--lines=}'[Number of journal entries to show.]:integer' \
+    {-o+,--output=}'[Change journal output mode.]:output modes:_sd_outputmodes' \
+    '--verify=[Verification mode for downloaded images.]:verify:(no checksum signature)' \
+    '--force[Download image even if already exists.]' \
+    '*::machinectl command:_machinectl_commands'
diff --git a/shell-completion/zsh/_networkctl b/shell-completion/zsh/_networkctl
new file mode 100644
index 0000000..24d1180
--- /dev/null
+++ b/shell-completion/zsh/_networkctl
@@ -0,0 +1,56 @@
+#compdef networkctl
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_networkctl_commands] )) ||
+    _networkctl_commands() {
+        local -a _networkctl_cmds
+        _networkctl_cmds=(
+            'list:List existing links'
+            'status:Show information about the specified links'
+            'lldp:Show Link Layer Discovery Protocol status'
+            'label:Show address labels'
+            'delete:Delete virtual netdevs'
+            'up:Bring devices up'
+            'down:Bring devices down'
+            'renew:Renew dynamic configurations'
+            'forcerenew:Trigger DHCP reconfiguration of all connected clients'
+            'reconfigure:Reconfigure interfaces'
+            'reload:Reload .network and .netdev files'
+        )
+        if (( CURRENT == 1 )); then
+            _describe -t commands 'networkctl command' _networkctl_cmds
+        else
+            local curcontext="$curcontext"
+            local -a _links
+            cmd="${${_networkctl_cmds[(r)$words[1]:*]%%:*}}"
+            case $cmd in
+                (list|status|up|down|lldp|delete|renew|forcerenew|reconfigure)
+                    _links=( "${(foa)$(networkctl list --no-legend | awk 'BEGIN{OFS=":"} {sub(/[[ \t]+/, ""); print $2,$0}' 2>/dev/null)}" )
+                    if [[ -n "$_links" ]]; then
+                         _describe -t links 'links' _links
+                    else
+                        _message "no links"
+                    fi
+                    ;;
+                *)
+                    _message "no more options"
+                    ;;
+            esac
+        fi
+    }
+
+(( $+functions[_networkctl_get_json] )) || _networkctl_get_json()
+{
+    local -a _json_forms
+    _json_forms=( $(networkctl --json=help 2>/dev/null) )
+    _values 'format' $_json_forms
+}
+
+_arguments \
+    {-a,--all}'[Show all links with status]' \
+    '--no-pager[Do not pipe output into a pager]' \
+    '--no-legend[Do not print the column headers]' \
+    {-h,--help}'[Show this help]' \
+    '--version[Show package version]' \
+    '--json[Shows output formatted as JSON]:format:_networkctl_get_json' \
+    '*::networkctl commands:_networkctl_commands'
diff --git a/shell-completion/zsh/_oomctl b/shell-completion/zsh/_oomctl
new file mode 100644
index 0000000..18e1938
--- /dev/null
+++ b/shell-completion/zsh/_oomctl
@@ -0,0 +1,28 @@
+#compdef oomctl
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_oomctl_commands] )) || _oomctl_commands()
+{
+    local -a _oomctl_cmds
+    _oomctl_cmds=(
+        "dump:Show the current state of cgroups and system contexts"
+        "help:Prints a short help text and exits."
+    )
+    if (( CURRENT == 1 )); then
+        _describe -t commands 'oomctl command' _oomctl_cmds
+    else
+        local curcontext="$curcontext"
+        cmd="${${_oomctl_cmds[(r)$words[1]:*]%%:*}}"
+        if (( $+functions[_oomctl_$cmd] )); then
+            _oomctl_$cmd
+        else
+            _message "no more options"
+        fi
+    fi
+}
+
+_arguments \
+    {-h,--help}'[Prints a short help text and exits.]' \
+    '--version[Prints a short version string and exits.]' \
+    '--no-pager[Do not pipe output into a pager]' \
+    '*::oomctl command:_oomctl_commands'
diff --git a/shell-completion/zsh/_resolvectl b/shell-completion/zsh/_resolvectl
new file mode 100644
index 0000000..4363ce7
--- /dev/null
+++ b/shell-completion/zsh/_resolvectl
@@ -0,0 +1,84 @@
+#compdef resolvectl systemd-resolve
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <https://www.gnu.org/licenses/>.
+
+(( $+functions[_resolvectl_protocols] )) ||
+    _resolvectl_protocols() {
+        local -a _protocol
+        _protocol=( $(_call_program protocol ${service} --legend=no --protocol help; echo help) )
+        _values 'protocol' "$_protocol[@]"
+    }
+
+(( $+functions[_resolvectl_types] )) ||
+    _resolvectl_types() {
+        local -a _type
+        _type=( $(_call_program type ${service} --legend=no --type help; echo help) )
+        _values 'type' "$_type[@]"
+    }
+
+(( $+functions[_resolvectl_classes] )) ||
+    _resolvectl_classes() {
+        local -a _class
+        _class=( $(_call_program class ${service} --legend=no --class help; echo help) )
+        _values 'class' "$_class[@]"
+    }
+
+(( $+functions[_resolvectl_commands] )) ||
+    _resolvectl_commands() {
+    local -a _resolvectl_cmds
+    _resolvectl_cmds=(
+        default-route:"Configure per-interface default-route setting"
+        dns:"Configure per-interface DNS configuration"
+        dnsovertls:"Configure per-interface dnsovertls enabled status"
+        dnssec:"Configure per-interface dnssec enabled status"
+        domain:"Configure per-interface search and route-only domains"
+        flush-caches:"Flushes all DNS resource record caches the service maintains locally"
+        llmnr:"Configure per-interface llmnr enabled status"
+        mdns:"Configure per-interface mdns enabled status"
+        nta:"Configure per-interface nta domains"
+        openpgp:"Retrieve openpgp keys for an email"
+        query:"Resolve domain names, IPv4 and IPv6 addresses"
+        reset-server-features:"Flushes all feature level information the resolver has learned about specific servers"
+        reset-statistics:"Resets the statistics counter shown in statistics to zero"
+        revert:"Revert the per-interfce DNS configuration"
+        service:"Resolve DNS-SD and SRV services"
+        statistics:"Show resolver statistics"
+        status:"Show the global and per-link DNS settings currently in effect"
+        tlsa:"Query tlsa public keys stored as TLSA resource records"
+    )
+
+    if (( CURRENT == 1 )); then
+        _describe -t commands 'resolvectl commands' _resolvectl_cmds
+    fi
+}
+
+_arguments \
+    {-h,--help}'[Print a short help text and exit]' \
+    '--version[Print a short version string and exit]' \
+    '--legend=no[Do not show headers and footers]' \
+    '-4[Resolve IPv4 addresses]' \
+    '-6[Resolve IPv6 addresses]' \
+    {-i+,--interface=}'[Look on interface]:interface:_net_interfaces' \
+    {-p+,--protocol=}'[Look via protocol]:protocol:_resolvectl_protocols' \
+    {-t+,--type=}'[Query RR with DNS type]:type:_resolvectl_types' \
+    {-c+,--class=}'[Query RR with DNS class]:class:_resolvectl_classes' \
+    '--service[Resolve services]' \
+    '--service-address=no[Do not resolve address for services]' \
+    '--service-txt=no[Do not resolve TXT records for services]' \
+    '--cname=no[Do not follow CNAME redirects]' \
+    '--search=no[Do not use search domains]' \
+    '*::default: _resolvectl_commands'
diff --git a/shell-completion/zsh/_sd_hosts_or_user_at_host b/shell-completion/zsh/_sd_hosts_or_user_at_host
new file mode 100644
index 0000000..8148ed1
--- /dev/null
+++ b/shell-completion/zsh/_sd_hosts_or_user_at_host
@@ -0,0 +1,6 @@
+#autoload
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+_alternative \
+    'users-hosts:: _user_at_host' \
+    'hosts:: _hosts'
diff --git a/shell-completion/zsh/_sd_machines b/shell-completion/zsh/_sd_machines
new file mode 100644
index 0000000..b960745
--- /dev/null
+++ b/shell-completion/zsh/_sd_machines
@@ -0,0 +1,19 @@
+#autoload
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[__sd_machines_get_machines] )) ||
+    __sd_machines_get_machines () {
+
+    { machinectl list --full --max-addresses=0 --no-legend --no-pager 2>/dev/null; echo ".host"; } | \
+	{ while read a b; do echo "$a"; done; } | \
+        sort -u
+    }
+
+local -a _machines
+_machines=("${(fo)$(__sd_machines_get_machines)}")
+typeset -U _machines
+if [[ -n "$_machines" ]]; then
+    _describe 'machines' _machines
+else
+    _message 'no machines'
+fi
diff --git a/shell-completion/zsh/_sd_outputmodes b/shell-completion/zsh/_sd_outputmodes
new file mode 100644
index 0000000..68b1187
--- /dev/null
+++ b/shell-completion/zsh/_sd_outputmodes
@@ -0,0 +1,6 @@
+#autoload
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+local -a _output_opts
+_output_opts=(short short-full short-iso short-iso-precise short-precise short-monotonic short-unix short-delta verbose export json json-pretty json-sse json-seq cat with-unit)
+_describe -t output 'output mode' _output_opts || compadd "$@"
diff --git a/shell-completion/zsh/_sd_unit_files b/shell-completion/zsh/_sd_unit_files
new file mode 100644
index 0000000..654f48f
--- /dev/null
+++ b/shell-completion/zsh/_sd_unit_files
@@ -0,0 +1,10 @@
+#autoload
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+_sd_unit_files() {
+    local files expl
+    files=( '*:files:->files' )
+
+    _description files expl 'unit file'
+    _files "$expl[@]" -g '*.(automount|device|mount|path|service|socket|swap|target|timer)'
+}
diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in
new file mode 100644
index 0000000..48c0bf2
--- /dev/null
+++ b/shell-completion/zsh/_systemctl.in
@@ -0,0 +1,549 @@
+#compdef systemctl
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_systemctl_commands] )) || _systemctl_commands()
+{
+    local expl i
+
+    local -a unit_commands=(
+        # Unit Commands
+        "list-automounts:List automounts"
+        "list-sockets:List sockets"
+        "list-timers:List timers"
+        "list-units:List units"
+        "start:Start (activate) one or more units"
+        "stop:Stop (deactivate) one or more units"
+        "reload:Reload one or more units"
+        "restart:Start or restart one or more units"
+        "condrestart:Restart one or more units if active"
+        "try-restart:Restart one or more units if active"
+        "reload-or-restart:Reload one or more units if possible, otherwise start or restart"
+        "force-reload:Reload one or more units if possible, otherwise restart if active"
+        "try-reload-or-restart:Reload one or more units if possible, otherwise restart if active"
+        "isolate:Start one unit and stop all others"
+        "kill:Send signal to processes of a unit"
+        "is-active:Check whether units are active"
+        "is-failed:Check whether units are failed"
+        "status:Show runtime status of one or more units"
+        "show:Show properties of one or more units/jobs or the manager"
+        "cat:Show the source unit files and drop-ins"
+        "set-property:Sets one or more properties of a unit"
+        "service-log-level:Get or set the logging threshold for service"
+        "service-log-target:Get or set the logging target for service"
+        "help:Show documentation for specified units"
+        "reset-failed:Reset failed state for all, one, or more units"
+        "list-dependencies:Show unit dependency tree"
+        "clean:Remove configuration, state, cache, logs or runtime data of units"
+        "bind:Bind mount a path from the host into a unit's namespace"
+        "mount-image:Mount an image from the host into a unit's namespace"
+    )
+
+    local -a machine_commands=(
+        # Machine Commands
+        "list-machines:List the host and all running local containers"
+    )
+
+    local -a unit_file_commands=(
+        # Unit File Commands
+        "list-unit-files:List installed unit files"
+        "enable:Enable one or more unit files"
+        "disable:Disable one or more unit files"
+        "reenable:Reenable one or more unit files"
+        "preset:Enable/disable one or more unit files based on preset configuration"
+        "preset-all:Enable/disable all unit files based on preset configuration"
+        "is-enabled:Check whether unit files are enabled"
+        "mask:Mask one or more units"
+        "unmask:Unmask one or more units"
+        "link:Link one or more units files into the search path"
+        "revert:Revert unit files to their vendor versions"
+        "add-wants:Add Wants= dependencies to a unit"
+        "add-requires:Add Requires= dependencies to a unit"
+        "set-default:Set the default target"
+        "get-default:Query the default target"
+        "edit:Edit one or more unit files"
+    )
+
+    local -a job_commands=(
+        # Job Commands
+        "list-jobs:List jobs"
+        "cancel:Cancel all, one, or more jobs"
+    )
+
+    local -a environment_commands=(
+        # Environment Commands
+        "show-environment:Dump environment"
+        "set-environment:Set one or more environment variables"
+        "unset-environment:Unset one or more environment variables"
+        "import-environment:Import environment variables set on the client"
+    )
+
+    local -a manager_state_commands=(
+        # Manager State Commands
+        "daemon-reload:Reload systemd manager configuration"
+        "daemon-reexec:Reexecute systemd manager"
+        "log-level:Get or set the log level"
+        "log-target:Get or set the log target"
+        "service-watchdogs:Get or set the state of software watchdogs"
+    )
+
+    local -a system_commands=(
+        # System Commands
+        "is-system-running:Query overall status of the system"
+        "default:Enter system default mode"
+        "rescue:Enter system rescue mode"
+        "emergency:Enter system emergency mode"
+        "halt:Shut down and halt the system"
+        "suspend:Suspend the system"
+        "poweroff:Shut down and power-off the system"
+        "reboot:Shut down and reboot the system"
+        "kexec:Shut down and reboot the system with kexec"
+        "exit:Ask for user instance termination"
+        "switch-root:Change root directory"
+        "hibernate:Hibernate the system"
+        "hybrid-sleep:Hibernate and suspend the system"
+        "suspend-then-hibernate:Suspend the system for a period of time, and then hibernate it"
+    )
+
+    local -a groups=( unit machine unit_file job environment manager_state system )
+    local -a _systemctl_cmds
+    for i in $groups; do
+        _systemctl_cmds+=( "${(@P)${:-"${i}_commands"}}" )
+    done
+
+    if (( CURRENT == 1 )); then
+        _tags ${^groups//_/-}-commands
+        while _tags; do
+            for i in $groups; do
+                if _requested ${i//_/-}-commands; then
+                    _describe -t ${i//_/-}-commands "${i//_/ } command" ${i}_commands \
+                        && ret=0
+                fi
+            done
+        done
+    else
+        local curcontext="$curcontext"
+
+        cmd="${${_systemctl_cmds[(r)$words[1]:*]%%:*}}"
+        # Deal with any aliases
+        case $cmd in
+            condrestart) cmd="try-restart";;
+            force-reload) cmd="try-reload-or-restart";;
+        esac
+
+        if (( $#cmd )); then
+            curcontext="${curcontext%:*:*}:systemctl-${cmd}:"
+
+            local update_policy
+            zstyle -s ":completion:${curcontext}:" cache-policy update_policy
+            if [[ -z "$update_policy" ]]; then
+                zstyle ":completion:${curcontext}:" cache-policy _systemctl_caching_policy
+            fi
+
+            _call_function ret _systemctl_$cmd || _message 'no more arguments'
+        else
+            _message "unknown systemctl command: $words[1]"
+        fi
+        return ret
+    fi
+}
+
+# @todo _systemd-run has a helper with the same name, so we must redefine
+__systemctl()
+{
+    systemctl $_sys_service_mgr --full --legend=no --no-pager --plain "$@" 2>/dev/null
+}
+
+
+# Fills the unit list
+(( $+functions[_systemctl_all_units] )) ||
+    _systemctl_all_units()
+{
+    if ( [[ ${+_sys_all_units} -eq 0 ]] || _cache_invalid SYS_ALL_UNITS$_sys_service_mgr ) ||
+           ! _retrieve_cache SYS_ALL_UNITS$_sys_service_mgr;
+    then
+        _sys_all_units=( ${${(f)"$(__systemctl list-units --all)"}%% *} )
+        _store_cache SYS_ALL_UNITS$_sys_service_mgr _sys_all_unis
+    fi
+}
+
+# Fills the unit list including all file units
+(( $+functions[_systemctl_really_all_units] )) ||
+    _systemctl_really_all_units()
+{
+    local -a all_unit_files;
+    local -a really_all_units;
+    if ( [[ ${+_sys_really_all_units} -eq 0 ]] || _cache_invalid SYS_REALLY_ALL_UNITS$_sys_service_mgr ) ||
+           ! _retrieve_cache SYS_REALLY_ALL_UNITS$_sys_service_mgr;
+    then
+        all_unit_files=( ${${(f)"$(__systemctl list-unit-files)"}%% *} )
+        _systemctl_all_units
+        really_all_units=($_sys_all_units $all_unit_files)
+        _sys_really_all_units=(${(u)really_all_units})
+        _store_cache SYS_REALLY_ALL_UNITS$_sys_service_mgr _sys_really_all_units
+    fi
+}
+
+(( $+functions[_filter_units_by_property] )) ||
+    _filter_units_by_property() {
+        local property=$1 value=$2; shift 2
+        local -a units; units=("${(q-)@}")
+        local -A props
+        props=(${(f)"$(_call_program units "$service $_sys_service_mgr show --no-pager --property=\"Id,$property\" -- ${units} 2>/dev/null")"})
+        echo -E - "${(@g:o:)${(k@)props[(Re)$property=$value]}#Id=}"
+    }
+
+(( $+functions[_systemctl_get_non_template_names] )) ||
+    _systemctl_get_non_template_names() {
+        _systemctl_really_all_units
+        print -r - ${_sys_really_all_units:#*@.*}
+    }
+
+(( $+functions[_systemctl_get_template_names] )) ||
+    _systemctl_get_template_names() { echo -E - ${^${(M)${(f)"$(__systemctl list-unit-files)"}##*@.[^[:space:]]##}%%@.*}\@ }
+
+(( $+functions[_systemctl_active_units] )) ||
+    _systemctl_active_units()  {
+        local pattern
+        if zstyle -T ":completion:$curcontext" use-pattern; then
+            pattern="$PREFIX*$SUFFIX"
+        fi
+        _sys_active_units=(  ${${(f)"$(__systemctl list-units $pattern)"}%% *} )
+    }
+
+(( $+functions[_systemctl_startable_units] )) ||
+    _systemctl_startable_units(){
+        local pattern
+        if zstyle -T ":completion:$curcontext" use-pattern; then
+            pattern="$PREFIX*$SUFFIX"
+        fi
+        _sys_startable_units=( $( _filter_units_by_property ActiveState inactive $(
+                                      _filter_units_by_property CanStart yes ${${${(f)"$(
+      __systemctl list-unit-files --state enabled,enabled-runtime,linked,linked-runtime,static,indirect,disabled,generated,transient $pattern
+      __systemctl list-units --state inactive,failed $pattern
+    )"}:#*@.*}%%[[:space:]]*}
+                                                            )) )
+    }
+
+(( $+functions[_systemctl_restartable_units] )) ||
+    _systemctl_restartable_units(){
+        local pattern
+        if zstyle -T ":completion:$curcontext" use-pattern; then
+            pattern="$PREFIX*$SUFFIX"
+        fi
+        _sys_restartable_units=( $( _filter_units_by_property CanStart yes ${${${(f)"$(
+    __systemctl list-unit-files --state enabled,disabled,static $pattern
+    __systemctl list-units $pattern
+  )"}:#*@.*}%%[[:space:]]*} ) )
+    }
+
+(( $+functions[_systemctl_failed_units] )) ||
+    _systemctl_failed_units()  {_sys_failed_units=( ${${(f)"$(__systemctl list-units --state=failed)"}%% *} ) }
+
+(( $+functions[_systemctl_unit_state] )) ||
+    _systemctl_unit_state() {
+        setopt localoptions extendedglob
+        local pattern
+        if zstyle -T ":completion:$curcontext" use-pattern; then
+            pattern="$PREFIX*$SUFFIX"
+        fi
+        typeset -gA _sys_unit_state
+        _sys_unit_state=( ${=${${(f)"$(__systemctl list-unit-files $pattern)"}%%[[:space:]]#}% *} )
+    }
+
+local fun
+# Completion functions for ALL_UNITS
+for fun in cat mask ; do
+    (( $+functions[_systemctl_$fun] )) || _systemctl_$fun()
+    {
+        _systemctl_really_all_units
+        _wanted systemd-units expl unit \
+                compadd "$@" -a - _sys_really_all_units
+    }
+done
+
+# Completion functions for NONTEMPLATE_UNITS
+for fun in is-active is-failed is-enabled status show preset help list-dependencies edit revert add-wants add-requires set-property; do
+    (( $+functions[_systemctl_$fun] )) || _systemctl_$fun()
+    {
+        _wanted systemd-units expl unit \
+                compadd "$@" - $(_systemctl_get_non_template_names)
+    }
+done
+
+# Completion functions for ENABLED_UNITS
+(( $+functions[_systemctl_disable] )) || _systemctl_disable()
+{
+    local _sys_unit_state; _systemctl_unit_state
+    _wanted systemd-units expl 'enabled unit' \
+            compadd "$@" - ${(k)_sys_unit_state[(R)enabled]}
+}
+
+(( $+functions[_systemctl_reenable] )) || _systemctl_reenable()
+{
+    local _sys_unit_state; _systemctl_unit_state
+    _wanted systemd-units expl 'enabled/disabled unit' \
+            compadd "$@" - ${(k)_sys_unit_state[(R)(enabled|disabled)]} $(_systemctl_get_template_names)
+}
+
+# Completion functions for DISABLED_UNITS
+(( $+functions[_systemctl_enable] )) || _systemctl_enable()
+{
+    local _sys_unit_state; _systemctl_unit_state
+    _wanted systemd-units expl 'disabled unit' \
+            compadd "$@" - ${(k)_sys_unit_state[(R)disabled]} $(_systemctl_get_template_names)
+}
+
+# Completion functions for FAILED_UNITS
+(( $+functions[_systemctl_reset-failed] )) || _systemctl_reset-failed()
+{
+    local _sys_failed_units; _systemctl_failed_units
+    _wanted systemd-units expl 'failed unit' \
+            compadd "$@" -a - _sys_failed_units || _message "no failed unit found"
+}
+
+# Completion functions for STARTABLE_UNITS
+(( $+functions[_systemctl_start] )) || _systemctl_start()
+{
+    local _sys_startable_units; _systemctl_startable_units
+    _wanted systemd-units expl 'startable unit' \
+            compadd "$@" - ${_sys_startable_units[*]}
+}
+
+# Completion functions for STOPPABLE_UNITS
+for fun in stop kill try-restart condrestart ; do
+    (( $+functions[_systemctl_$fun] )) || _systemctl_$fun()
+    {
+        local _sys_active_units; _systemctl_active_units
+        _wanted systemd-units expl 'stoppable unit' \
+                compadd "$@" - $( _filter_units_by_property CanStop yes \
+                                                            ${_sys_active_units[*]} )
+    }
+done
+
+(( $+functions[_systemctl_service-log-level] )) ||
+    _systemctl_service-log-level() {
+        local -a log_levels=( emerg alert crit err warning notice info debug )
+        local _sys_active_units; _systemctl_active_units
+        if (( CURRENT == 2 )); then
+            _wanted systemd-units expl 'active unit' \
+                compadd "$@" -a - _sys_active_units || _message "no units found"
+        else
+            compadd "$@" -a - log_levels
+        fi
+}
+
+(( $+functions[_systemctl_service-log-target] )) ||
+    _systemctl_service-log-target() {
+        local -a log_targets=( console kmsg journal syslog null auto )
+        local _sys_active_units; _systemctl_active_units
+        if (( CURRENT == 2 )); then
+            _wanted systemd-units expl 'active unit' \
+                compadd "$@" -a - _sys_active_units || _message "no units found"
+        else
+            compadd "$@" -a - log_targets
+        fi
+}
+
+# Completion functions for ISOLATABLE_UNITS
+(( $+functions[_systemctl_isolate] )) || _systemctl_isolate()
+{
+    _systemctl_all_units
+    _wanted systemd-units expl 'isolatable unit' \
+            compadd "$@" - $( _filter_units_by_property AllowIsolate yes \
+                                                        ${_sys_all_units[*]} )
+}
+
+# Completion functions for RELOADABLE_UNITS
+for fun in reload try-reload-or-restart force-reload ; do
+    (( $+functions[_systemctl_$fun] )) || _systemctl_$fun()
+    {
+        local _sys_active_units; _systemctl_active_units
+        _wanted systemd-units expl 'reloadable unit' \
+                compadd "$@" - $( _filter_units_by_property CanReload yes \
+                                                            ${_sys_active_units[*]} )
+    }
+done
+
+# Completion functions for RESTARTABLE_UNITS
+for fun in restart reload-or-restart ; do
+    (( $+functions[_systemctl_$fun] )) || _systemctl_$fun()
+    {
+        local _sys_restartable_units; _systemctl_restartable_units
+        _wanted systemd-units expl 'restartable unit' \
+                compadd "$@" - ${_sys_restartable_units[*]}
+    }
+done
+
+# Completion functions for MASKED_UNITS
+(( $+functions[_systemctl_unmask] )) || _systemctl_unmask()
+{
+    local _sys_unit_state; _systemctl_unit_state
+    _wanted systemd-units expl 'masked unit' \
+            compadd "$@" - ${(k)_sys_unit_state[(R)masked]} || _message "no masked units found"
+}
+
+# Completion functions for JOBS
+(( $+functions[_systemctl_cancel] )) || _systemctl_cancel()
+{
+    _wanted systemd-jobs expl job \
+            compadd "$@" - ${${(f)"$(__systemctl list-jobs)"}%% *} ||
+        _message "no jobs found"
+}
+
+# Completion functions for TARGETS
+(( $+functions[_systemctl_set-default] )) || _systemctl_set-default()
+{
+    _wanted systemd-targets expl target \
+            compadd "$@" - ${${(f)"$(__systemctl list-unit-files --type target --all)"}%% *} ||
+        _message "no targets found"
+}
+
+# Completion functions for ENVS
+for fun in set-environment unset-environment ; do
+    (( $+functions[_systemctl_$fun] )) || _systemctl_$fun()
+    {
+        local fun=$0 ; fun=${fun##_systemctl_}
+        local suf
+        if [[ "${fun}" = "set-environment" ]]; then
+            suf='-S='
+        fi
+        _wanted systemd-environment expl 'environment variable' \
+                compadd "$@" ${suf} - ${${(f)"$(systemctl show-environment)"}%%=*}
+    }
+done
+
+(( $+functions[_systemctl_import-environment] )) || _systemctl_import-environment()
+{
+    _parameters
+}
+
+(( $+functions[_systemctl_link] )) || _systemctl_link() {
+        _sd_unit_files
+    }
+
+(( $+functions[_systemctl_switch-root] )) || _systemctl_switch-root() {
+        _files
+    }
+
+(( $+functions[_systemctl_bind] )) || _systemctl_bind() {
+        _files
+    }
+
+(( $+functions[_systemctl_mount-image] )) || _systemctl_mount-image() {
+        _files
+    }
+
+# no systemctl completion for:
+#    [STANDALONE]='daemon-reexec daemon-reload default
+#                  emergency exit halt kexec list-jobs list-units
+#                  list-unit-files poweroff reboot rescue show-environment'
+
+(( $+functions[_systemctl_caching_policy] )) ||
+    _systemctl_caching_policy()
+{
+    local _sysunits
+    local -a oldcache
+
+    # rebuild if cache is more than a day old
+    oldcache=( "$1"(mh+1) )
+    (( $#oldcache )) && return 0
+
+    _sysunits=(${${(f)"$(__systemctl --all)"}%% *})
+
+    if (( $#_sysunits )); then
+        for unit in $_sysunits; do
+            [[ "$unit" -nt "$1" ]] && return 0
+        done
+    fi
+
+    return 1
+}
+
+(( $+functions[_systemctl_unit_states] )) ||
+    _systemctl_unit_states() {
+        local -a _states
+        _states=("${(fo)$(__systemctl --state=help)}")
+        _values -s , "${_states[@]}"
+    }
+
+(( $+functions[_systemctl_unit_types] )) ||
+    _systemctl_unit_types() {
+        local -a _types
+        _types=("${(fo)$(__systemctl -t help)}")
+        _values -s , "${_types[@]}"
+    }
+
+(( $+functions[_systemctl_unit_properties] )) ||
+    _systemctl_unit_properties() {
+        if ( [[ ${+_sys_all_properties} -eq 0 ]] || _cache_invalid SYS_ALL_PROPERTIES$_sys_service_mgr ) ||
+               ! _retrieve_cache SYS_ALL_PROPERTIES$_sys_service_mgr;
+        then
+            _sys_all_properties=( ${${(M)${(f)"$({{ROOTLIBEXECDIR}}/systemd --dump-bus-properties)"}}} )
+            _store_cache SYS_ALL_PROPERTIES$_sys_service_mgr _sys_all_properties
+        fi
+        _values -s , "${_sys_all_properties[@]}"
+    }
+
+(( $+functions[_systemctl_job_modes] )) ||
+    _systemctl_job_modes() {
+        local -a _modes
+        _modes=(fail replace replace-irreversibly isolate ignore-dependencies ignore-requirements flush)
+        _values -s , "${_modes[@]}"
+    }
+
+(( $+functions[_systemctl_timestamp] )) ||
+    _systemctl_timestamp() {
+        local -a _styles
+        _styles=(help pretty us µs utc us+utc µs+utc)
+        _values -s , "${_styles[@]}"
+    }
+
+(( $+functions[_systemctl_check_inhibitors] )) ||
+    _systemctl_check_inhibitors() {
+        local -a _modes
+        _modes=(auto yes no)
+        _values -s , "${_modes[@]}"
+    }
+
+# Build arguments for "systemctl" to be used in completion.
+local -a _modes; _modes=("--user" "--system")
+# Use the last mode (they are exclusive and the last one is used).
+local _sys_service_mgr=${${words:*_modes}[(R)(${(j.|.)_modes})]}
+_arguments -s \
+    {-h,--help}'[Show help]' \
+    '--version[Show package version]' \
+    {-t+,--type=}'[List only units of a particular type]:unit type:_systemctl_unit_types' \
+    '--state=[Display units in the specified state]:unit state:_systemctl_unit_states' \
+    '--job-mode=[Specify how to deal with other jobs]:mode:_systemctl_job_modes' \
+    {-p+,--property=}'[Show only properties by specific name]:unit property:_systemctl_unit_properties' \
+    {-a,--all}'[Show all units/properties, including dead/empty ones]' \
+    '--reverse[Show reverse dependencies]' \
+    '--after[Show units ordered after]' \
+    '--before[Show units ordered before]' \
+    {-l,--full}"[Don't ellipsize unit names on output]" \
+    '--show-types[When showing sockets, show socket type]' \
+    '--check-inhibitors[Specify if inhibitors should be checked]:mode:_systemctl_check_inhibitors' \
+    {-q,--quiet}'[Suppress output]' \
+    '--no-block[Do not wait until operation finished]' \
+    '--legend=no[Do not print a legend, i.e. the column headers and the footer with hints]' \
+    '--no-pager[Do not pipe output into a pager]' \
+    '--system[Connect to system manager]' \
+    '--user[Connect to user service manager]' \
+    "--no-wall[Don't send wall message before halt/power-off/reboot]" \
+    '--global[Enable/disable/mask default user unit files globally]' \
+    "--no-reload[When enabling/disabling unit files, don't reload daemon configuration]" \
+    '--no-ask-password[Do not ask for system passwords]' \
+    '--kill-whom=[Whom to send signal to]:killwhom:(main control all)' \
+    {-s+,--signal=}'[Which signal to send]:signal:_signals' \
+    {-f,--force}'[When enabling unit files, override existing symlinks. When shutting down, execute action immediately]' \
+    '--root=[Enable/disable/mask unit files in the specified root directory]:directory:_directories' \
+    '--runtime[Enable/disable/mask unit files only temporarily until next reboot]' \
+    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+    {-P,--privileged}'[Acquire privileges before execution]' \
+    {-n+,--lines=}'[Journal entries to show]:number of entries' \
+    {-o+,--output=}'[Change journal output mode]:modes:_sd_outputmodes' \
+    '--firmware-setup[Tell the firmware to show the setup menu on next boot]' \
+    '--plain[When used with list-dependencies, print output as a list]' \
+    '--failed[Show failed units]' \
+    '--timestamp=[Change format of printed timestamps]:style:_systemctl_timestamp' \
+    '*::systemctl command:_systemctl_commands'
diff --git a/shell-completion/zsh/_systemd b/shell-completion/zsh/_systemd
new file mode 100644
index 0000000..8636315
--- /dev/null
+++ b/shell-completion/zsh/_systemd
@@ -0,0 +1,81 @@
+#compdef systemd-cat systemd-ask-password systemd-cgls systemd-cgtop systemd-detect-virt systemd-machine-id-setup systemd-notify systemd-tty-ask-password-agent
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+local curcontext="$curcontext" state lstate line
+case "$service" in
+    systemd-ask-password)
+        _arguments \
+            {-h,--help}'[Show this help]' \
+            '--icon=[Icon name]:icon name:' \
+            '--timeout=[Timeout in sec]:timeout (seconds):' \
+            '--no-tty[Ask question via agent even on TTY]' \
+            '--accept-cached[Accept cached passwords]' \
+            '--multiple[List multiple passwords if available]'
+        ;;
+    systemd-cat)
+        _arguments \
+            {-h,--help}'[Show this help]' \
+            '--version[Show package version.]' \
+            {-t+,--identifier=}'[Set syslog identifier.]:syslog identifier:' \
+            {-p+,--priority=}'[Set priority value.]:value:({0..7})' \
+            '--level-prefix=[Control whether level prefix shall be parsed.]:boolean:(1 0)' \
+            ':Message'
+        ;;
+    systemd-cgls)
+        _arguments \
+            {-h,--help}'[Show this help]' \
+            '--version[Show package version]' \
+            '--no-pager[Do not pipe output into a pager]' \
+            {-a,--all}'[Show all groups, including empty]' \
+            '-k[Include kernel threads in output]' \
+            ':cgroups:(cpuset cpu cpuacct memory devices freezer blkio)'
+        ;;
+    systemd-cgtop)
+        _arguments \
+            {-h,--help}'[Show this help]' \
+            '--version[Print version and exit]' \
+            '(-c -m -i -t)-p[Order by path]' \
+            '(-c -p -m -i)-t[Order by number of tasks]' \
+            '(-m -p -i -t)-c[Order by CPU load]' \
+            '(-c -p -i -t)-m[Order by memory load]' \
+            '(-c -m -p -t)-i[Order by IO load]' \
+            {-d+,--delay=}'[Specify delay]:delay:' \
+            {-n+,--iterations=}'[Run for N iterations before exiting]:number of iterations:' \
+            {-b,--batch}'[Run in batch mode, accepting no input]' \
+            '--depth=[Maximum traversal depth]:maximum depth:'
+        ;;
+    systemd-detect-virt)
+        _arguments \
+            {-h,--help}'[Show this help]' \
+            '--version[Show package version]' \
+            {-c,--container}'[Only detect whether we are run in a container]' \
+            {-v,--vm}'[Only detect whether we are run in a VM]' \
+            {-q,--quiet}"[Don't output anything, just set return value]"
+        ;;
+    systemd-machine-id-setup)
+        _arguments \
+            {-h,--help}'[Show this help]' \
+            '--version[Show package version]'
+        ;;
+    systemd-notify)
+        _arguments \
+            {-h,--help}'[Show this help]' \
+            '--version[Show package version]' \
+            '--ready[Inform the init system about service start-up completion.]' \
+            '--pid=[Inform the init system about the main PID of the daemon]:daemon main PID:_pids' \
+            '--status=[Send a free-form status string for the daemon to the init systemd]:status string:' \
+            '--booted[Returns 0 if the system was booted up with systemd]'
+        ;;
+    systemd-tty-ask-password-agent)
+        _arguments \
+            {-h,--help}'[Prints a short help text and exits.]' \
+            '--version[Prints a short version string and exits.]' \
+            '--list[Lists all currently pending system password requests.]' \
+            '--query[Process all currently pending system password requests by querying the user on the calling TTY.]' \
+            '--watch[Continuously process password requests.]' \
+            '--wall[Forward password requests to wall(1).]' \
+            '--plymouth[Ask question with plymouth(8).]' \
+            '--console[Ask question on /dev/console.]'
+        ;;
+    *) _message 'eh?' ;;
+esac
diff --git a/shell-completion/zsh/_systemd-analyze b/shell-completion/zsh/_systemd-analyze
new file mode 100644
index 0000000..e305995
--- /dev/null
+++ b/shell-completion/zsh/_systemd-analyze
@@ -0,0 +1,113 @@
+#compdef systemd-analyze
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_systemd-analyze_verify] )) ||
+    _systemd-analyze_verify() {
+        _sd_unit_files
+    }
+
+(( $+functions[_systemd-analyze_cat-config] )) ||
+	_systemd-analyze_cat-config() {
+        _files -W '(/run/systemd/ /etc/systemd/ /usr/lib/systemd/)' -P 'systemd/'
+    }
+
+(( $+functions[_systemd-analyze_critical-chain] )) ||
+    _systemd-analyze_critical-chain() {
+        local -a _units
+        systemctl list-units --no-legend --no-pager --plain --all |
+        while read -r a b c; do
+            _units+=($a)
+        done
+        compadd -a _units
+    }
+
+(( $+functions[_systemd-analyze_security] )) ||
+    _systemd-analyze_security() {
+        _sd_unit_files
+    }
+
+(( $+functions[_systemd-analyze_syscall-filter] )) ||
+    _systemd-analyze_syscall-filter() {
+        local -a _groups
+        _groups=( $(systemd-analyze --quiet --no-pager syscall-filter | grep '^@') )
+        _describe -t groups 'syscall groups' _groups || compadd "$@"
+    }
+
+(( $+functions[_systemd-analyze_filesystems] )) ||
+    _systemd-analyze_filesystems() {
+        local -a _groups
+        _groups=( $(systemd-analyze --quiet --no-pager filesystems | grep '^@') )
+        _describe -t groups 'file system groups' _groups || compadd "$@"
+    }
+
+(( $+functions[_systemd-analyze_commands] )) ||
+    _systemd-analyze_commands(){
+        local -a _systemd_analyze_cmds
+        # Descriptions taken from systemd-analyze --help.
+        _systemd_analyze_cmds=(
+            'time:Print time spent in the kernel before reaching userspace'
+            'blame:Print list of running units ordered by time to init'
+            'critical-chain:Print a tree of the time critical chain of units'
+            'plot:Output SVG graphic showing service initialization'
+            'dot:Dump dependency graph (in dot(1) format)'
+            'dump:Dump server status'
+            'cat-config:Cat systemd config files'
+            'unit-files:List files and symlinks for units'
+            'unit-paths:List unit load paths'
+            'exit-status:List known exit statuses'
+            'capability:List capability definitions'
+            'syscall-filter:List syscalls in seccomp filters'
+            'filesystems:List known filesystems'
+            'condition:Evaluate Condition*= and Assert*= assignments'
+            'verify:Check unit files for correctness'
+            'calendar:Validate repetitive calendar time events'
+            'timestamp:Parse a systemd syntax timestamp'
+            'timespan:Parse a systemd syntax timespan'
+            'security:Analyze security settings of a service'
+            'inspect-elf:Parse and print ELF package metadata'
+            # log-level, log-target, service-watchdogs have been deprecated
+        )
+
+        if (( CURRENT == 1 )); then
+            _describe "options" _systemd_analyze_cmds
+        else
+            local curcontext="$curcontext"
+            cmd="${${_systemd_analyze_cmds[(r)$words[1]:*]%%:*}}"
+            if (( $#cmd )); then
+                if (( $+functions[_systemd-analyze_$cmd] )) && (( CURRENT == 2 )); then
+                    _systemd-analyze_$cmd
+                else
+                    _message "no more options"
+                fi
+            else
+                _message "unknown systemd-analyze command: $words[1]"
+            fi
+        fi
+    }
+
+_arguments \
+    {-h,--help}'[Show help text]' \
+    '--version[Show package version]' \
+    '--system[Operate on system systemd instance]' \
+    '--user[Operate on user systemd instance]' \
+    '--global[Show global user instance config]' \
+    '--root=[Add support for root argument]:PATH' \
+    '--image=[Add support for discrete images]:PATH' \
+    '--recursive-errors=[When verifying a unit, control dependency verification]:MODE' \
+    '--offline=[Perform a security review of the specified unit files]:BOOL:(yes no)' \
+    '--threshold=[Set a value to compare the overall security exposure level with]: NUMBER' \
+    '--security-policy=[Use customized requirements to compare unit files against]: PATH' \
+    '--json=[Generate a JSON output of the security analysis table]:MODE:(pretty short off)' \
+    '--profile=[Include the specified profile in the security review of units]: PATH' \
+    '--no-pager[Do not pipe output into a pager]' \
+    '--man=[Do (not) check for existence of man pages]:BOOL:(yes no)' \
+    '--generators=[Do (not) run unit generators]:BOOL:(yes no)' \
+    '--order[When generating graph for dot, show only order]' \
+    '--require[When generating graph for dot, show only requirement]' \
+    '--fuzz=[When printing the tree of the critical chain, print also services, which finished TIMESPAN earlier, than the latest in the branch]:TIMESPAN' \
+    '--from-pattern=[When generating a dependency graph, filter only origins]:GLOB' \
+    '--to-pattern=[When generating a dependency graph, filter only destinations]:GLOB' \
+    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+    {-M+,--machine=}'[Operate on local container]:machine:_sd_machines' \
+    '--quiet[Do not show hints]' \
+    '*::systemd-analyze commands:_systemd-analyze_commands'
diff --git a/shell-completion/zsh/_systemd-delta b/shell-completion/zsh/_systemd-delta
new file mode 100644
index 0000000..7d7456b
--- /dev/null
+++ b/shell-completion/zsh/_systemd-delta
@@ -0,0 +1,17 @@
+#compdef systemd-delta
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_systemd-delta_types] )) ||
+_systemd-delta_types() {
+    local -a _delta_types
+    _delta_types=(masked equivalent redirected overridden unchanged)
+    _values -s , "${_delta_types[@]}"
+}
+
+_arguments \
+    {-h,--help}'[Show this help]' \
+    '--version[Show package version]' \
+    '--no-pager[Do not pipe output into a pager]' \
+    '--diff=[Show a diff when overridden files differ]:boolean:(1 0)' \
+    {-t+,--type=}'[Only display a selected set of override types]:types:_systemd-delta_types' \
+    ':SUFFIX:(tmpfiles.d sysctl.d systemd/system)'
diff --git a/shell-completion/zsh/_systemd-inhibit b/shell-completion/zsh/_systemd-inhibit
new file mode 100644
index 0000000..059ef9e
--- /dev/null
+++ b/shell-completion/zsh/_systemd-inhibit
@@ -0,0 +1,36 @@
+#compdef systemd-inhibit
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_systemd-inhibit_commands] )) ||
+_systemd-inhibit_commands(){
+    if (( CURRENT == 1 )); then
+        compset -q
+        _normal
+    else
+        local n=${words[(b:2:i)[^-]*]}
+        if (( n <= CURRENT )); then
+            compset -n $n
+            _alternative \
+                'files:file:_files' \
+                'commands:command:_normal' && return 0
+        fi
+        _default
+    fi
+}
+
+(( $+functions[_systemd-inhibit_what] )) ||
+_systemd-inhibit_what() {
+    local _inhibit
+    _inhibit=(shutdown sleep idle handle-power-key handle-suspend-key handle-hibernate-key handle-lid-switch)
+    _values -s : "${_inhibit[@]}"
+}
+
+_arguments \
+    {-h,--help}'[Show this help]' \
+    '--version[Show package version]' \
+    '--what=[Operations to inhibit]:options:_systemd-inhibit_what' \
+    '--who=[A descriptive string who is inhibiting]:who is inhibiting:' \
+    '--why=[A descriptive string why is being inhibited]:reason for the lock:' \
+    '--mode=[One of block or delay]:lock mode:( block delay )' \
+    '--list[List active inhibitors]' \
+    '*:commands:_systemd-inhibit_commands'
diff --git a/shell-completion/zsh/_systemd-nspawn b/shell-completion/zsh/_systemd-nspawn
new file mode 100644
index 0000000..adc5d7c
--- /dev/null
+++ b/shell-completion/zsh/_systemd-nspawn
@@ -0,0 +1,53 @@
+#compdef systemd-nspawn
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_systemd-nspawn_caps] )) ||
+_systemd-nspawn_caps(){
+    local -a _caps
+    _caps=( CAP_CHOWN CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH
+            CAP_FOWNER CAP_FSETID CAP_IPC_OWNER CAP_KILL CAP_LEASE CAP_LINUX_IMMUTABLE
+            CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SETGID CAP_SETFCAP CAP_SETPCAP
+            CAP_SETUID CAP_SYS_ADMIN CAP_SYS_CHROOT CAP_SYS_NICE CAP_SYS_PTRACE CAP_SYS_TTY_CONFIG
+            CAP_SYS_RESOURCE CAP_SYS_BOOT )
+    _values -s , 'capabilities' "$_caps[@]"
+}
+
+_arguments \
+    {-h,--help}'[Show this help.]' \
+    '--version[Print a short version string and exit.]' \
+    {--quiet,-q}'[Turns off any status output by the tool itself.]' \
+    {--directory=,-D+}'[Directory to use as file system root for the namespace container. If omitted the current directory will be used.]:directories:_directories' \
+    '--template=[Initialize root directory from template directory, if missing.]:template:_directories' \
+    {--ephemeral,-x}'[Run container with snapshot of root directory, and remove it after exit.]' \
+    {--image=,-i+}'[Disk image to mount the root directory for the container from.]:disk image: _files' \
+    {--boot,-b}'[Automatically search for an init binary and invoke it instead of a shell or a user supplied program.]' \
+    {--user=,-u+}'[Run the command under specified user, create home directory and cd into it.]:user:_users' \
+    {--machine=,-M+}'[Sets the machine name for this container.]: : _message "container name"' \
+    '--uuid=[Set the specified uuid for the container.]: : _message "container UUID"' \
+    {--slice=,-S+}'[Make the container part of the specified slice, instead of the default machine.slice.]: : _message slice' \
+    '--private-network[Disconnect networking of the container from the host.]' \
+    '--network-interface=[Assign the specified network interface to the container.]: : _net_interfaces' \
+    '--network-macvlan=[Create a "macvlan" interface of the specified Ethernet network interface and add it to the container.]: : _net_interfaces' \
+    '--network-ipvlan=[Create an "ipvlan" network interface based on an existing network interface to the container.]: : _net_interfaces' \
+    {--network-veth,-n}'[Create a virtual Ethernet link (veth) between host and container.]' \
+    '--network-bridge=[Adds the host side of the Ethernet link created with --network-veth to the specified bridge.]: : _net_interfaces' \
+    {--port=,-p+}'[Expose a container IP port on the host.]: : _message port' \
+    {--selinux-context=,-Z+}'[Sets the SELinux security context to be used to label processes in the container.]: : _message "SELinux context"' \
+    {--selinux-apifs-context=,-L+}'[Sets the SELinux security context to be used to label files in the virtual API file systems in the container.]: : _message "SELinux context"' \
+    '--capability=[List one or more additional capabilities to grant the container.]:capabilities:_systemd-nspawn_caps' \
+    '--drop-capability=[Specify one or more additional capabilities to drop for the containerm]:capabilities:_systemd-nspawn_caps' \
+    "--link-journal=[Control whether the container's journal shall be made visible to the host system.]:options:(no host guest auto)" \
+    '-j[Equivalent to --link-journal=guest.]' \
+    '--read-only[Mount the root file system read only for the container.]' \
+    '--bind=[Bind mount a file or directory from the host into the container.]: : _files' \
+    '--bind-ro=[Bind mount a file or directory from the host into the container (read-only).]: : _files' \
+    '--tmpfs=[Mount an empty tmpfs to the specified directory.]: : _files' \
+    '--setenv=[Specifies an environment variable assignment to pass to the init process in the container, in the format "NAME=VALUE".]: : _message "environment variables"' \
+    '--share-system[Allows the container to share certain system facilities with the host.]' \
+    '--register=[Controls whether the container is registered with systemd-machined(8).]:systemd-machined registration:( yes no )' \
+    '--keep-unit[Instead of creating a transient scope unit to run the container in, simply register the service or scope unit systemd-nspawn has been invoked in with systemd-machined(8).]' \
+    '--personality=[Control the architecture ("personality") reported by uname(2) in the container.]:architecture:(x86 x86-64)' \
+    '--volatile=[Run the system in volatile mode.]:volatile:(no yes state)' \
+    "--notify-ready=[Control when the ready notification is sent]:options:(yes no)" \
+    "--suppress-sync=[Control whether to suppress disk synchronization for the container payload]:options:(yes no)" \
+    '*:: : _normal'
diff --git a/shell-completion/zsh/_systemd-path b/shell-completion/zsh/_systemd-path
new file mode 100644
index 0000000..d1fb24b
--- /dev/null
+++ b/shell-completion/zsh/_systemd-path
@@ -0,0 +1,9 @@
+#compdef systemd-path
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+typeset -A sdpath=( ${$(systemd-path)/:/} )
+_arguments -S \
+	'(-h --help)'{-h,--help}'[Print help text and exit]' \
+	'(-v --version)'{-v,--version}'[Print a version string and exit]' \
+	'--suffix=[Append a suffix to the paths]' \
+	'*:pathname:compadd -k sdpath'
diff --git a/shell-completion/zsh/_systemd-run b/shell-completion/zsh/_systemd-run
new file mode 100644
index 0000000..7568ed4
--- /dev/null
+++ b/shell-completion/zsh/_systemd-run
@@ -0,0 +1,81 @@
+#compdef systemd-run
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# @todo _systemctl has a helper with the same name, so we must redefine
+__systemctl() {
+    local -a _modes
+    _modes=("--user" "--system")
+    systemctl ${words:*_modes} --full --no-legend --no-pager --plain "$@" 2>/dev/null
+}
+
+(( $+functions[__systemd-run_get_slices] )) ||
+    __systemd-run_get_slices () {
+        __systemctl list-units --all -t slice \
+            | { while read -r a b; do echo $a; done; };
+    }
+
+(( $+functions[__systemd-run_slices] )) ||
+    __systemd-run_slices () {
+        local -a _slices
+        _slices=(${(fo)"$(__systemd-run_get_slices)"})
+        typeset -U _slices
+        _describe 'slices' _slices
+    }
+
+_arguments \
+    {-G,--collect}'[Unload the transient unit after it completed]' \
+    '--description=[Description for unit]:description' \
+    '--gid=[Run as system group]:group:_groups' \
+    {-h,--help}'[Show help message]' \
+    {-H+,--host=}'[Operate on remote host]:[user@]host:_sd_hosts_or_user_at_host' \
+    {-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \
+    '--nice=[Nice level]:nice level' \
+    '--no-ask-password[Do not query the user for authentication]' \
+    '--no-block[Do not synchronously wait for the unit start operation to finish]' \
+    '--on-active=[Run after SEC seconds]:SEC' \
+    '--on-boot=[Run SEC seconds after machine was booted up]:SEC' \
+    '--on-calendar=[Realtime timer]:SPEC' \
+    '--on-clock-change[Defines a trigger based on system clock jumps]' \
+    '--on-startup=[Run SEC seconds after systemd was first started]:SEC' \
+    '--on-timezone-change[Defines a trigger based on system timezone changes]' \
+    '--on-unit-active=[Run SEC seconds after the last activation]:SEC' \
+    '--on-unit-inactive=[Run SEC seconds after the last deactivation]:SEC' \
+    '--path-property=[Set path unit property]:NAME=VALUE' \
+    {-P,--pipe}'[Inherit standard input, output, and error]' \
+    {-p+,--property=}'[Set unit property]:NAME=VALUE:(( \
+                CPUAccounting= MemoryAccounting= BlockIOAccounting= SendSIGHUP= \
+                SendSIGKILL= MemoryLimit= CPUShares= BlockIOWeight= User= Group= \
+                DevicePolicy= KillMode= ExitType= DeviceAllow= BlockIOReadBandwidth= \
+                BlockIOWriteBandwidth= BlockIODeviceWeight= Nice= Environment= \
+                KillSignal= RestartKillSignal= FinalKillSignal= LimitCPU= LimitFSIZE= LimitDATA= \
+                LimitSTACK= LimitCORE= LimitRSS= LimitNOFILE= LimitAS= LimitNPROC= \
+                LimitMEMLOCK= LimitLOCKS= LimitSIGPENDING= LimitMSGQUEUE= \
+                LimitNICE= LimitRTPRIO= LimitRTTIME= PrivateTmp= PrivateDevices= \
+                PrivateNetwork= NoNewPrivileges= WorkingDirectory= RootDirectory= \
+                TTYPath= SyslogIdentifier= SyslogLevelPrefix= SyslogLevel= \
+                SyslogFacility= TimerSlackNSec= OOMScoreAdjust= ReadWritePaths= \
+                ReadOnlyPaths= InaccessiblePaths= EnvironmentFile= \
+                ProtectSystem= ProtectHome= RuntimeDirectory= PassEnvironment= \
+                ))' \
+    {-t,--pty}'[The service connects to the terminal]' \
+    {-q,--quiet}'[Suppresses additional informational output]' \
+    {-r,--remain-after-exit}'[Leave service around until explicitly stopped]' \
+    {-d,--same-dir}'[Run on the current working directory]' \
+    '--scope[Run this as scope rather than service]' \
+    '--send-sighup[Send SIGHUP when terminating]' \
+    '--service-type=[Service type]:type:(simple forking oneshot dbus notify idle)' \
+    {-E+,--setenv=}'[Set environment]:NAME=VALUE' \
+    {-S,--shell}'[requests an interactive shell in the current working directory]' \
+    '--slice=[Run in the specified slice]:slices:__systemd-run_slices' \
+    '--slice-inherit[Run in the inherited slice]' \
+    '--socket-property=[Set socket unit property]:NAME=VALUE' \
+    '--system[Run as system unit]' \
+    '--timer-property=[Set timer unit property]:NAME=VALUE' \
+    '--uid=[Run as system user]:user:_users' \
+    {-u+,--unit=}'[Run under the specified unit name]:unit name' \
+    '--user[Run as user unit]' \
+    '--version[Show package version]' \
+    '--wait=[Wait until service stopped again]' \
+    '--working-directory=[Run with the specified working directory]' \
+    '(-):command: _command_names -e' \
+    '*::arguments:_normal'
diff --git a/shell-completion/zsh/_systemd-tmpfiles b/shell-completion/zsh/_systemd-tmpfiles
new file mode 100644
index 0000000..6c9094a
--- /dev/null
+++ b/shell-completion/zsh/_systemd-tmpfiles
@@ -0,0 +1,14 @@
+#compdef systemd-tmpfiles
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+_arguments \
+    {-h,--help}'[Show help]' \
+    '--version[Show package version]' \
+    '--create[Create, set ownership/permissions based on the config files.]' \
+    '--clean[Clean up all files and directories with an age parameter configured.]' \
+    '--remove[All files and directories marked with r, R in the configuration files are removed.]' \
+    '--boot[Execute actions only safe at boot]' \
+    '--prefix=[Only apply rules that apply to paths with the specified prefix.]' \
+    '--exclude-prefix=[Ignore rules that apply to paths with the specified prefix.]' \
+    '--root=[Operate on an alternate filesystem root]:directory:_directories' \
+    '*::files:_files'
diff --git a/shell-completion/zsh/_timedatectl b/shell-completion/zsh/_timedatectl
new file mode 100644
index 0000000..2467b80
--- /dev/null
+++ b/shell-completion/zsh/_timedatectl
@@ -0,0 +1,69 @@
+#compdef timedatectl
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+_timedatectl_set-timezone(){
+    local -a _timezones
+    _timezones=( ${(f)"$(_call_program timezones "${service}" list-timezones)"} )
+    compadd "$_timezones[@]"
+}
+
+_timedatectl_set-time(){
+    _message "YYYY-MM-DD HH:MM:SS"
+}
+
+_timedatectl_set-local-rtc(){
+    local -a _options
+    _options=(
+        '0:Maintain RTC in universal time'
+        '1:Maintain RTC in local time'
+    )
+    _describe options _options
+}
+
+_timedatectl_set-ntp(){
+    local -a _options
+    _options=(
+        '0:Disable NTP based network time configuration'
+        '1:Enable NTP based network time configuration'
+    )
+    _describe options _options
+}
+
+_timedatectl_command(){
+    local -a _timedatectl_cmds
+    _timedatectl_cmds=(
+        'status:Show current time settings'
+        'set-time:Set system time'
+        'set-timezone:Set system timezone'
+        'list-timezones:Show known timezones'
+        'timesync-status:Show status of systemd-timesyncd'
+        'show-timesync:Show properties of systemd-timesyncd'
+        'set-local-rtc:Control whether RTC is in local time'
+        'set-ntp:Control whether NTP is enabled'
+    )
+    if (( CURRENT == 1 )); then
+        _describe -t commands 'timedatectl command' _timedatectl_cmds
+    else
+        local curcontext="$curcontext"
+        cmd="${${_timedatectl_cmds[(r)$words[1]:*]%%:*}}"
+        if (( $#cmd )); then
+            if (( $+functions[_timedatectl_$cmd] )); then
+                _timedatectl_$cmd
+            else
+                _message "no more options"
+            fi
+        else
+            _message "unknown timedatectl command: $words[1]"
+        fi
+    fi
+}
+
+_arguments -s \
+    {-h,--help}'[Show this help]' \
+    '--version[Show package version]' \
+    '--adjust-system-clock[Adjust system clock when changing local RTC mode]' \
+    '--no-pager[Do not pipe output into a pager]' \
+    '--no-ask-password[Do not prompt for password]' \
+    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+    {-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \
+    '*::timedatectl commands:_timedatectl_command'
diff --git a/shell-completion/zsh/_udevadm b/shell-completion/zsh/_udevadm
new file mode 100644
index 0000000..f7c3384
--- /dev/null
+++ b/shell-completion/zsh/_udevadm
@@ -0,0 +1,182 @@
+#compdef udevadm
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+(( $+functions[_udevadm_info] )) ||
+_udevadm_info(){
+    _arguments \
+        '--query=[Query the database for specified type of device data. It needs the --path or --name to identify the specified device.]:type:(name symlink path property all)' \
+        '--path=[The devpath of the device to query.]:sys files:_files -P /sys/ -W /sys' \
+        '--name=[The name of the device node or a symlink to query]:device files:_files -P /dev/ -W /dev' \
+        '--root[Print absolute paths in name or symlink query.]' \
+        '--attribute-walk[Print all sysfs properties of the specified device that can be used in udev rules to match the specified device]' \
+        '--export[Print output as key/value pairs.]' \
+        '--export-prefix=[Add a prefix to the key name of exported values.]:prefix' \
+        '--device-id-of-file=[Print major/minor numbers of the underlying device, where the file lives on.]:files:_udevadm_mounts' \
+        '--export-db[Export the content of the udev database.]' \
+        '--cleanup-db[Cleanup the udev database.]' \
+        '--value[When showing properties, print only their values.]' \
+        '--property=[Show only properties by this name.]'
+}
+
+(( $+functions[_udevadm_trigger] )) ||
+_udevadm_trigger(){
+    _arguments \
+        '--verbose[Print the list of devices which will be triggered.]' \
+        '--dry-run[Do not actually trigger the event.]' \
+        '--quiet[Suppress error logging in triggering events.]' \
+        '--type=[Trigger a specific type of devices.]:types:(all devices subsystems failed)' \
+        '--action=[Type of event to be triggered.]:actions:(add change remove move online offline bind unbind)' \
+        '--subsystem-match=[Trigger events for devices which belong to a matching subsystem.]' \
+        '--subsystem-nomatch=[Do not trigger events for devices which belong to a matching subsystem.]' \
+        '--attr-match=attribute=[Trigger events for devices with a matching sysfs attribute.]' \
+        '--attr-nomatch=attribute=[Do not trigger events for devices with a matching sysfs attribute.]' \
+        '--property-match=[Trigger events for devices with a matching property value.]' \
+        '--tag-match=property[Trigger events for devices with a matching tag.]' \
+        '--sysname-match=[Trigger events for devices with a matching sys device name.]' \
+        '--parent-match=[Trigger events for all children of a given device.]' \
+        '--initialized-match[Trigger events for devices that are already initialized.]' \
+        '--initialized-nomatch[Trigger events for devices that are not initialized yet.]' \
+        '--uuid[Print synthetic uevent UUID.]' \
+        '--prioritized-subsystem=[Trigger events for devices which belong to a matching subsystem earlier.]'
+}
+
+(( $+functions[_udevadm_settle] )) ||
+_udevadm_settle(){
+    _arguments \
+       '--timeout=[Maximum number of seconds to wait for the event queue to become empty.]' \
+       '--seq-start=[Wait only for events after the given sequence number.]' \
+       '--seq-end=[Wait only for events before the given sequence number.]' \
+       '--exit-if-exists=[Stop waiting if file exists.]:files:_files' \
+       '--quiet[Do not print any output, like the remaining queue entries when reaching the timeout.]' \
+       '--help[Print help text.]'
+}
+
+(( $+functions[_udevadm_control] )) ||
+_udevadm_control(){
+    _arguments \
+        '--exit[Signal and wait for systemd-udevd to exit.]' \
+        '--log-priority=[Set the internal log level of systemd-udevd.]:priorities:(err info debug)' \
+        '--stop-exec-queue[Signal systemd-udevd to stop executing new events. Incoming events will be queued.]' \
+        '--start-exec-queue[Signal systemd-udevd to enable the execution of events.]' \
+        '--reload[Signal systemd-udevd to reload the rules files and other databases like the kernel module index.]' \
+        '--property=[Set a global property for all events.]' \
+        '--children-max=[Set the maximum number of events.]' \
+        '--timeout=[The maximum number of seconds to wait for a reply from systemd-udevd.]' \
+        '--help[Print help text.]'
+}
+
+(( $+functions[_udevadm_monitor] )) ||
+_udevadm_monitor(){
+    _arguments \
+        '--kernel[Print the kernel uevents.]' \
+        '--udev[Print the udev event after the rule processing.]' \
+        '--property[Also print the properties of the event.]' \
+        '--subsystem-match=[Filter events by subsystem/\[devtype\].]' \
+        '--tag-match=[Filter events by property.]' \
+        '--help[Print help text.]'
+}
+
+(( $+functions[_udevadm_test] )) ||
+_udevadm_test(){
+    _arguments \
+        '--action=[The action string.]:actions:(add change remove move online offline bind unbind)' \
+        '--subsystem=[The subsystem string.]' \
+        '--help[Print help text.]' \
+        '*::devpath:_files -P /sys/ -W /sys'
+}
+
+(( $+functions[_udevadm_test-builtin] )) ||
+_udevadm_test-builtin(){
+    if (( CURRENT == 2 )); then
+    _arguments \
+        '--action=[The action string.]:actions:(add change remove move online offline bind unbind)' \
+        '--help[Print help text]' \
+        '*::builtins:(blkid btrfs hwdb input_id net_id net_setup_link kmod path_id usb_id uaccess)'
+    elif  (( CURRENT == 3 )); then
+        _arguments \
+            '--action=[The action string.]:actions:(add change remove move online offline bind unbind)' \
+            '--help[Print help text]' \
+            '*::syspath:_files -P /sys -W /sys'
+    else
+        _arguments \
+            '--action=[The action string.]:actions:(add change remove move online offline bind unbind)' \
+            '--help[Print help text]'
+    fi
+}
+
+(( $+functions[_udevadm_wait] )) ||
+_udevadm_wait(){
+    _arguments \
+        '--timeout=[Maximum number of seconds to wait for the devices being created.]' \
+        '--initialized=[Wait for devices being initialized by systemd-udevd.]:boolean:(yes no)' \
+        '--removed[Wait for devices being removed.]' \
+        '--settle[Also wait for udev queue being empty.]' \
+        '--help[Print help text.]' \
+        '*::devpath:_files -P /dev/ -W /dev'
+}
+
+(( $+functions[_udevadm_lock] )) ||
+_udevadm_lock(){
+    _arguments \
+        '--timeout=[Maximum number of seconds to wait for the devices being locked.]' \
+        '--device=[Block device to lock.]' \
+        '--backing=[File whose backing block device to lock.]' \
+        '--print[Only show which block device the lock would be taken on.]' \
+        '--help[Print help text.]'
+}
+
+(( $+functions[_udevadm_mounts] )) ||
+_udevadm_mounts(){
+    local dev_tmp dpath_tmp mp_tmp mline
+
+    tmp=( "${(@f)$(< /proc/self/mounts)}" )
+    dev_tmp=( "${(@)${(@)tmp%% *}:#none}" )
+    mp_tmp=( "${(@)${(@)tmp#* }%% *}" )
+
+    local MATCH
+    mp_tmp=("${(@q)mp_tmp//(#m)\\[0-7](#c3)/${(#)$(( 8#${MATCH[2,-1]} ))}}")
+    dpath_tmp=( "${(@Mq)dev_tmp:#/*}" )
+    dev_tmp=( "${(@q)dev_tmp:#/*}" )
+
+    _alternative \
+        'device-paths: device path:compadd -a dpath_tmp' \
+        'directories:mount point:compadd -a mp_tmp'
+}
+
+(( $+functions[_udevadm_commands] )) ||
+_udevadm_commands(){
+    local -a _udevadm_cmds
+    _udevadm_cmds=(
+        'info:query sysfs or the udev database'
+        'trigger:request events from the kernel'
+        'settle:wait for the event queue to finish'
+        'control:control the udev daemon'
+        'monitor:listen to kernel and udev events'
+        'test:test an event run'
+        'test-builtin:test a built-in command'
+        'wait:wait for devices or device symlinks being created'
+        'lock:lock a block device and run a comand'
+    )
+
+    if ((CURRENT == 1)); then
+        _describe -t commands 'udevadm commands' _udevadm_cmds
+    else
+        local curcontext="$curcontext"
+        cmd="${${_udevadm_cmds[(r)$words[1]:*]%%:*}}"
+        if (($#cmd)); then
+            if (( $+functions[_udevadm_$cmd] )); then
+                _udevadm_$cmd
+            else
+                _message "no options for $cmd"
+            fi
+        else
+            _message "no more options"
+        fi
+    fi
+}
+
+_arguments \
+    '--debug[Print debug messages to stderr]' \
+    '--version[Print version number]' \
+    '--help[Print help text]' \
+    '*::udevadm commands:_udevadm_commands'
diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build
new file mode 100644
index 0000000..b39f933
--- /dev/null
+++ b/shell-completion/zsh/meson.build
@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+zshcompletiondir = get_option('zshcompletiondir')
+if zshcompletiondir == ''
+        zshcompletiondir = datadir / 'zsh/site-functions'
+endif
+
+custom_target(
+        '_systemctl',
+        input : '_systemctl.in',
+        output : '_systemctl',
+        command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
+        install : zshcompletiondir != 'no',
+        install_dir : zshcompletiondir)
+
+items = [['_busctl',                   ''],
+         ['_journalctl',               ''],
+         ['_systemd-analyze',          ''],
+         ['_systemd-delta',            ''],
+         ['_systemd-nspawn',           ''],
+         ['_systemd',                  ''],
+         ['_systemd-path',             ''],
+         ['_systemd-run',              ''],
+         ['_udevadm',                  ''],
+         ['_kernel-install',           'ENABLE_KERNEL_INSTALL'],
+         ['_sd_hosts_or_user_at_host', ''],
+         ['_sd_outputmodes',           ''],
+         ['_sd_unit_files',            ''],
+         ['_sd_machines',              ''],
+         ['_bootctl',                  'HAVE_GNU_EFI'],
+         ['_coredumpctl',              'ENABLE_COREDUMP'],
+         ['_hostnamectl',              'ENABLE_HOSTNAMED'],
+         ['_localectl',                'ENABLE_LOCALED'],
+         ['_loginctl',                 'ENABLE_LOGIND'],
+         ['_machinectl',               'ENABLE_MACHINED'],
+         ['_networkctl',               'ENABLE_NETWORKD'],
+         ['_oomctl',                   'ENABLE_OOMD'],
+         ['_systemd-inhibit',          'ENABLE_LOGIND'],
+         ['_resolvectl',               'ENABLE_RESOLVE'],
+         ['_systemd-tmpfiles',         'ENABLE_TMPFILES'],
+         ['_timedatectl',              'ENABLE_TIMEDATED']]
+
+foreach item : items
+        if zshcompletiondir != 'no' and (item[1] == '' or conf.get(item[1]) == 1)
+                install_data(item[0],
+                             install_dir : zshcompletiondir)
+        endif
+endforeach