diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in
index 402d61daab..48c0bf289b 100644
--- a/shell-completion/zsh/_systemctl.in
+++ b/shell-completion/zsh/_systemctl.in
@@ -202,23 +202,37 @@ __systemctl()
     _systemctl_get_template_names() { echo -E - ${^${(M)${(f)"$(__systemctl list-unit-files)"}##*@.[^[:space:]]##}%%@.*}\@ }
 
 (( $+functions[_systemctl_active_units] )) ||
-    _systemctl_active_units()  {_sys_active_units=(  ${${(f)"$(__systemctl list-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
-      __systemctl list-units --state inactive,failed
+      __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
-    __systemctl list-units
+    __systemctl list-unit-files --state enabled,disabled,static $pattern
+    __systemctl list-units $pattern
   )"}:#*@.*}%%[[:space:]]*} ) )
     }
 
@@ -228,8 +242,12 @@ __systemctl()
 (( $+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)"}%%[[:space:]]#}% *} )
+        _sys_unit_state=( ${=${${(f)"$(__systemctl list-unit-files $pattern)"}%%[[:space:]]#}% *} )
     }
 
 local fun