4 files changed, 32 insertions, 11 deletions
diff --git a/Completion/Unix/Command/_chkconfig b/Completion/Unix/Command/_chkconfig
index 92bc60c60..912ac3829 100644
--- a/Completion/Unix/Command/_chkconfig
+++ b/Completion/Unix/Command/_chkconfig
@@ -9,13 +9,8 @@ linux*)
     '(-)--level[specify runlevels to apply to]:-:_values -s "" "run levels" 1 2 3 4 5 6 7' \
     '(- 2)--add[add new service]' \
     '(- 2)--del[remove service from chkconfig management]' \
-    '1:service name:->services' \
+    '1:service name:_services' \
     '2:state:(on off reset)' && ret=0
-
-  if [[ -n "$state" ]]; then
-    _wanted services expl 'system service' \
-	compadd ${${${(f)"$($words[1] --list)"}%%[ :]*}##$'\t'*} && ret=0
-  fi
 ;;
 irix*)
   _arguments -C \
diff --git a/Completion/Unix/Command/_init_d b/Completion/Unix/Command/_init_d
index b8bd0c61f..3556b85a4 100644
--- a/Completion/Unix/Command/_init_d
+++ b/Completion/Unix/Command/_init_d
@@ -1,21 +1,24 @@
 #compdef -P */(init|rc[0-9S]#).d/*
 
-local magic cmds what
+local magic cmds what script
 
 # This should probably be system specific...
 
+script=$words[1]
+[[ $script = */* ]] || script=/etc/init.d/$script
+
 # If the file starts with `#!' we hope that this is a shell script
 # and get lines looking like <space>foo|bar) with the words in $what.
 
 what='(st(art|op|atus)|(force-|)re(start|load)|debug_(up|down)|dump(|_stats)|add|delete|clean|list)'
 
-[[ -f $words[1] ]] && read -u0k 2 magic < $words[1] && [[ $magic = '#!' ]] &&
-    cmds=( ${${(j:|:s:|:)${(M)${(f)"$(< $words[1])"}:#[[:blank:]]#\'#${~what}(\|${~what})#\'#\)*}}//[^a-z_-]} )
+read -u0k 2 magic < $script && [[ $magic = '#!' ]] &&
+    cmds=( ${${(j:|:s:|:)${(M)${(f)"$(< $script)"}:#[[:blank:]]#(\'|)${~what}(\|{~what})#(\'|)\)}}//[^a-z_]} )
 
 # This would be the pattern to use every line of the form <space>foo).
 # Some people say this might match too many lines...
 #
-#    cmds=( ${${(j:|:s:|:)${(M)${(f)"$(< $words[1])"}:#[[:blank:]]#(\'|)[a-z_|]##(\'|)\)}}//[^a-z_]} )
+#    cmds=( ${${(j:|:s:|:)${(M)${(f)"$(< $script)"}:#[[:blank:]]#(\'|)[a-z_|]##\'|)\)}}//[^a-z_]} )
 
 (( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds ||
     cmds=(start stop)
diff --git a/Completion/Unix/Type/.distfiles b/Completion/Unix/Type/.distfiles
index b57c067a6..0ceee0e55 100644
--- a/Completion/Unix/Type/.distfiles
+++ b/Completion/Unix/Type/.distfiles
@@ -9,5 +9,5 @@ _files               _pdf                 _pspdf               _users
 _groups              _perl_basepods       _signals             _users_on
 _hosts               _perl_builtin_funcs  _tar_archive         _time_zone
 _file_systems        _net_interfaces      _terminals           _locales
-_java_class
+_java_class          _services
 '
diff --git a/Completion/Unix/Type/_services b/Completion/Unix/Type/_services
new file mode 100644
index 000000000..837a77586
--- /dev/null
+++ b/Completion/Unix/Type/_services
@@ -0,0 +1,23 @@
+#autoload
+
+local -a inits xinetds alls
+local expl ret=1
+
+if chkconfig --list > /dev/null 2>&1; then
+  alls=( ${(f)"$(LANGUAGE=C LANG=C LC_ALL=C chkconfig --list)"} )
+  inits=( ${${${alls[1,(r)xinetd based*]}[1,-2]}/%[[:space:]]*/} )
+  xinetds=( ${${${${alls[(r)xinetd based*,-1]}[2,-1]}/#[[:space:]]#}/%:*} )
+else
+  inits=( /etc/init.d/*(:t) )
+fi
+
+_tags init xinetd
+
+while _tags; do
+  _requested init expl 'init services' \
+    compadd  -a inits && ret=0
+  _requested xinetd expl 'xinetd services' \
+    compadd  -a xinetds && ret=0
+done
+
+return $ret