diff --git a/shell-completion/zsh/_systemd-analyze b/shell-completion/zsh/_systemd-analyze
index 89ba46c959..75e72439fd 100644
--- a/shell-completion/zsh/_systemd-analyze
+++ b/shell-completion/zsh/_systemd-analyze
@@ -27,6 +27,16 @@
         _describe -t state 'state' _states || compadd "$@"
     }
 
+(( $+functions[_systemd-analyze_cat-config] )) ||
+	_systemd-analyze_cat-config() {
+        _files -W '(/run/systemd/ /etc/systemd/ /usr/lib/systemd/)' -P 'systemd/'
+    }
+
+(( $+functions[_systemd-analyze_security] )) ||
+    _systemd-analyze_security() {
+        _sd_unit_files
+    }
+
 (( $+functions[_systemd-analyze_commands] )) ||
     _systemd-analyze_commands(){
         local -a _systemd_analyze_cmds
@@ -38,13 +48,20 @@
             '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'
-            'log-level:Get/set systemd log threshold'
-            'log-target:Get/set systemd log target'
-            'service-watchdogs:Get/set service watchdog status'
+            'exit-status:List known exit statuses'
             'syscall-filter:List syscalls in seccomp filter'
+            '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'
+            # 'log-level:Get/set systemd log threshold'
+            # 'log-target:Get/set systemd log target'
+            # 'service-watchdogs:Get/set service watchdog status'
         )
 
         if (( CURRENT == 1 )); then