2 files changed, 22 insertions, 1 deletions
diff --git a/Completion/Debian/Command/_debuild b/Completion/Debian/Command/_debuild
new file mode 100644
index 000000000..5b1d0ea37
--- /dev/null
+++ b/Completion/Debian/Command/_debuild
@@ -0,0 +1,20 @@
+#compdef debuild
+
+local ign noc
+
+(( $#words > 2 )) && ign='!'
+(( CURRENT != 2 )) && noc='!'
+
+_arguments \
+  "${ign}(- 1 *)"{-h,--help}'[display usage information]' \
+  "${ign}(- 1 *)--version[display version and copyright information]" \
+  ${noc}{--no-conf,--noconf}"[don't read devscripts config files]" \
+  {-r-,--rootcmd=}'[specify command used to become root if debuild not setuid root]: : _command_names -e' \
+  '(--preserve-env)*'{-e-,--preserve-envvar=}'[preserve environment variable]:environment variable:_parameters -g "*export*"' \
+  '(-e --preserve-envvar)--preserve-env[preserve all environment vars (except PATH)]' \
+  '*'{-e-,--set-envvar=}'[preserve environment variable]:environment variable:_parameters -g "*export*" -qS=' \
+  '--prepend-path=[prepend to the sanitised PATH]: :_dir_list' \
+  '(-D)-d[skip checking of build dependencies]' \
+  '(-d)-D[force checking of build dependencies]' \
+  '--check-dirname-level[specify how much to check directory names]:level [1]:((0\:never 1\:only\ if\ program\ changes\ directory 2\:always))' \
+  '--check-dirname-regex[specify what constitutes a matching directory name]:perl regex [PACKAGE(-.*)?]'
diff --git a/Completion/Debian/Command/_wajig b/Completion/Debian/Command/_wajig
index 26d08cfd7..630507e67 100644
--- a/Completion/Debian/Command/_wajig
+++ b/Completion/Debian/Command/_wajig
@@ -14,7 +14,8 @@ _arguments -C -s \
 
 case $state in
   cmds)
-    cmds=( ${${(M)${(f)"$(wajig commands 2>/dev/null)"}:# [^-]*}/(#b) ([^ ]#) #(*)/$match[1]:$match[2]:l} )
+    cmds=( ${(f)"$( _call_program commands $words[1] commands )"} )
+    cmds=( ${(@)cmds/(#b)([^ ]##) ##(?)(*)/$match[1]:${match[2]:l}${match[3]//:/\\:}} )
 
     _describe -t commands 'wajig command' cmds && ret=0
   ;;