diff --git a/shell-completion/zsh/_bootctl b/shell-completion/zsh/_bootctl
index 0ffef94e4ab..f0ac8925214 100644
--- a/shell-completion/zsh/_bootctl
+++ b/shell-completion/zsh/_bootctl
@@ -1,4 +1,4 @@
-#compdef bootctl
+#compdef bootctl                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_bootctl_commands] )) || _bootctl_commands()
diff --git a/shell-completion/zsh/_busctl b/shell-completion/zsh/_busctl
index d66ff3e0ce7..4e0362423c6 100644
--- a/shell-completion/zsh/_busctl
+++ b/shell-completion/zsh/_busctl
@@ -1,4 +1,4 @@
-#compdef busctl
+#compdef busctl                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 # busctl(1) completion                               -*- shell-script -*-
diff --git a/shell-completion/zsh/_coredumpctl b/shell-completion/zsh/_coredumpctl
index 74491626aa7..6b7d14a7661 100644
--- a/shell-completion/zsh/_coredumpctl
+++ b/shell-completion/zsh/_coredumpctl
@@ -1,4 +1,4 @@
-#compdef coredumpctl
+#compdef coredumpctl                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_coredumpctl_commands] )) ||
diff --git a/shell-completion/zsh/_hostnamectl b/shell-completion/zsh/_hostnamectl
index a5c89306d1d..d1ad85a18fb 100644
--- a/shell-completion/zsh/_hostnamectl
+++ b/shell-completion/zsh/_hostnamectl
@@ -1,4 +1,4 @@
-#compdef hostnamectl
+#compdef hostnamectl                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_hostnamectl_set-hostname] )) ||
diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl
index 0520e02de20..019ffbe87ac 100644
--- a/shell-completion/zsh/_journalctl
+++ b/shell-completion/zsh/_journalctl
@@ -1,4 +1,4 @@
-#compdef journalctl
+#compdef journalctl                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_journalctl_fields] )) ||
diff --git a/shell-completion/zsh/_kernel-install b/shell-completion/zsh/_kernel-install
index 5be5c4c3f28..4b5dd89d434 100644
--- a/shell-completion/zsh/_kernel-install
+++ b/shell-completion/zsh/_kernel-install
@@ -1,4 +1,4 @@
-#compdef kernel-install
+#compdef kernel-install                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_kernel-install_images] )) ||
diff --git a/shell-completion/zsh/_localectl b/shell-completion/zsh/_localectl
index 569f4f294c8..a712473ce24 100644
--- a/shell-completion/zsh/_localectl
+++ b/shell-completion/zsh/_localectl
@@ -1,4 +1,4 @@
-#compdef localectl
+#compdef localectl                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_localectl_set-locale] )) ||
diff --git a/shell-completion/zsh/_loginctl b/shell-completion/zsh/_loginctl
index c421a9b6c48..b9ccbedf75b 100644
--- a/shell-completion/zsh/_loginctl
+++ b/shell-completion/zsh/_loginctl
@@ -1,4 +1,4 @@
-#compdef loginctl
+#compdef loginctl                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_loginctl_all_sessions] )) ||
diff --git a/shell-completion/zsh/_machinectl b/shell-completion/zsh/_machinectl
index 1590b9f1b91..5ffb7e8b9ff 100644
--- a/shell-completion/zsh/_machinectl
+++ b/shell-completion/zsh/_machinectl
@@ -1,4 +1,4 @@
-#compdef machinectl
+#compdef machinectl                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[__machinectl_get_machines] )) ||
diff --git a/shell-completion/zsh/_networkctl b/shell-completion/zsh/_networkctl
index c9b730fbe33..4995bd3d105 100644
--- a/shell-completion/zsh/_networkctl
+++ b/shell-completion/zsh/_networkctl
@@ -1,4 +1,4 @@
-#compdef networkctl
+#compdef networkctl                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_networkctl_commands] )) ||
diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in
index 0c86fec95c4..07db6d47ce0 100644
--- a/shell-completion/zsh/_systemctl.in
+++ b/shell-completion/zsh/_systemctl.in
@@ -1,4 +1,4 @@
-#compdef systemctl
+#compdef systemctl                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_systemctl_commands] )) || _systemctl_commands()
diff --git a/shell-completion/zsh/_systemd b/shell-completion/zsh/_systemd
index cd674a71ea0..3550c15163a 100644
--- a/shell-completion/zsh/_systemd
+++ b/shell-completion/zsh/_systemd
@@ -1,4 +1,4 @@
-#compdef systemd-cat systemd-ask-password systemd-cgls systemd-cgtop systemd-detect-virt systemd-machine-id-setup systemd-notify systemd-tty-ask-password-agent
+#compdef systemd-cat systemd-ask-password systemd-cgls systemd-cgtop systemd-detect-virt systemd-machine-id-setup systemd-notify systemd-tty-ask-password-agent                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 local curcontext="$curcontext" state lstate line
diff --git a/shell-completion/zsh/_systemd-analyze b/shell-completion/zsh/_systemd-analyze
index 8a5fbb51246..89ba46c959d 100644
--- a/shell-completion/zsh/_systemd-analyze
+++ b/shell-completion/zsh/_systemd-analyze
@@ -1,4 +1,4 @@
-#compdef systemd-analyze
+#compdef systemd-analyze                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_systemd-analyze_log-level] )) ||
diff --git a/shell-completion/zsh/_systemd-delta b/shell-completion/zsh/_systemd-delta
index e07bbc8b2ba..b4361f7860f 100644
--- a/shell-completion/zsh/_systemd-delta
+++ b/shell-completion/zsh/_systemd-delta
@@ -1,4 +1,4 @@
-#compdef systemd-delta
+#compdef systemd-delta                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_systemd-delta_types] )) ||
diff --git a/shell-completion/zsh/_systemd-inhibit b/shell-completion/zsh/_systemd-inhibit
index 7c40e49ae46..c51c4851670 100644
--- a/shell-completion/zsh/_systemd-inhibit
+++ b/shell-completion/zsh/_systemd-inhibit
@@ -1,4 +1,4 @@
-#compdef systemd-inhibit
+#compdef systemd-inhibit                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_systemd-inhibit_commands] )) ||
diff --git a/shell-completion/zsh/_systemd-nspawn b/shell-completion/zsh/_systemd-nspawn
index abaabfc8956..414d82e2ea8 100644
--- a/shell-completion/zsh/_systemd-nspawn
+++ b/shell-completion/zsh/_systemd-nspawn
@@ -1,4 +1,4 @@
-#compdef systemd-nspawn
+#compdef systemd-nspawn                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_systemd-nspawn_caps] )) ||
diff --git a/shell-completion/zsh/_systemd-resolve b/shell-completion/zsh/_systemd-resolve
index 07f6ad26b57..3b0ce311f27 100644
--- a/shell-completion/zsh/_systemd-resolve
+++ b/shell-completion/zsh/_systemd-resolve
@@ -1,4 +1,4 @@
-#compdef systemd-resolve
+#compdef systemd-resolve                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 #
 # This file is part of systemd.
diff --git a/shell-completion/zsh/_systemd-run b/shell-completion/zsh/_systemd-run
index 2e0b3d2cfd8..6a703a075bf 100644
--- a/shell-completion/zsh/_systemd-run
+++ b/shell-completion/zsh/_systemd-run
@@ -1,4 +1,4 @@
-#compdef systemd-run
+#compdef systemd-run                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 # @todo _systemctl has a helper with the same name, so we must redefine
diff --git a/shell-completion/zsh/_systemd-tmpfiles b/shell-completion/zsh/_systemd-tmpfiles
index 0993bca5a4b..8860dc797cf 100644
--- a/shell-completion/zsh/_systemd-tmpfiles
+++ b/shell-completion/zsh/_systemd-tmpfiles
@@ -1,4 +1,4 @@
-#compdef systemd-tmpfiles
+#compdef systemd-tmpfiles                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 _arguments \
diff --git a/shell-completion/zsh/_timedatectl b/shell-completion/zsh/_timedatectl
index c1ed21e5656..e2dabc79a72 100644
--- a/shell-completion/zsh/_timedatectl
+++ b/shell-completion/zsh/_timedatectl
@@ -1,4 +1,4 @@
-#compdef timedatectl
+#compdef timedatectl                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 _timedatectl_set-timezone(){
diff --git a/shell-completion/zsh/_udevadm b/shell-completion/zsh/_udevadm
index eb133a42a68..ad0b73d4766 100644
--- a/shell-completion/zsh/_udevadm
+++ b/shell-completion/zsh/_udevadm
@@ -1,4 +1,4 @@
-#compdef udevadm
+#compdef udevadm                    -*- shell-script -*-
 # SPDX-License-Identifier: LGPL-2.1+
 
 (( $+functions[_udevadm_info] )) ||