4 files changed, 50 insertions, 11 deletions
diff --git a/Completion/Debian/Command/_apt b/Completion/Debian/Command/_apt
index 788fe3127..b51b2fc74 100644
--- a/Completion/Debian/Command/_apt
+++ b/Completion/Debian/Command/_apt
@@ -433,12 +433,15 @@ _apt-get () {
     /$'dselect-upgrade\0'/ \| \
     /$'clean\0'/ \| \
     /$'autoclean\0'/ \| \
+    /$'changelog\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \
     /$'check\0'/ \| \
     /$'source\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \
     /$'build-dep\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \| \
     /$'autoremove\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
     /$'help\0/' \| \
-    /"[]"/	':argument-1::compadd "$expl_action[@]" update upgrade install remove purge dist-upgrade dselect-upgrade clean autoclean check source build-dep autoremove help'
+    /$'markauto\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
+    /$'unmarkauto\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
+    /"[]"/	':argument-1::compadd "$expl_action[@]" update upgrade install remove purge dist-upgrade dselect-upgrade clean autoclean changelog check source build-dep autoremove help markauto unmarkauto'
 
   _apt-get () {
     local expl_action expl_packages
diff --git a/Completion/Debian/Command/_aptitude b/Completion/Debian/Command/_aptitude
index bfec49730..2c462e462 100644
--- a/Completion/Debian/Command/_aptitude
+++ b/Completion/Debian/Command/_aptitude
@@ -13,6 +13,39 @@ ${${(M)${(f)"$(</etc/apt/sources.list)"}\
   #}}}
 }
 
+# Helper function for -F / --display-format
+function _aptitude_format_strings() {
+  _values -s , 'format string' \
+    '%%[Literal %]' \
+    '%#number[Parameter replacement]' \
+    '%a[Action flag]' \
+    '%A[Action]' \
+    '%B[Broken count]' \
+    '%c[Current state flag]' \
+    '%C[Current state]' \
+    '%d[Description]' \
+    '%H[Hostname]' \
+    '%i[Pin priority]' \
+    '%I[Installed size]' \
+    '%m[Maintainer]' \
+    '%M[Automatic flag]' \
+    '%n[Program version]' \
+    '%N[Program name]' \
+    '%o[Download size]' \
+    '%p[Package name]' \
+    '%P[Priority]' \
+    '%r[Reverse depends count]' \
+    '%R[Abbreviated priority]' \
+    '%s[Section]' \
+    '%S[Trust status]' \
+    '%t[Archive]' \
+    '%T[Tagged]' \
+    '%u[Disk usage change]' \
+    '%v[Current version]' \
+    '%V[Candidate version]' \
+    '%Z[Size change]'
+}
+
 _arguments -C \
   '(- 1 *)'{-h,--help}'[display help information]' \
   '(- 1 *)--version[display version information]' \
@@ -20,7 +53,7 @@ _arguments -C \
   '(-d --download-only)'{-d,--download-only}"[just download packages - don\'t install]" \
   '(-P --prompt)'{-P,--prompt}'[always display a prompt]' \
   '(-y --assume-yes)'{-y,--assume-yes}'[assume yes answer to questions]' \
-  '(-F --display-format)'{-F,--display-format}'[specify output format for search command]:format' \
+  '(-F --display-format)'{-F,--display-format}'[specify output format for search command]:format:_aptitude_format_strings' \
   '(-O --sort)'{-O,--sort}'[specify sort order]:sort order:()' \
   '(-w --width)'{-w,--width}'[specify output width]:width' \
   '-f[aggressivley try to fix dependencies of broken packages]' \
diff --git a/Completion/Debian/Command/_bts b/Completion/Debian/Command/_bts
index 8ef1530c7..4907d15c1 100644
--- a/Completion/Debian/Command/_bts
+++ b/Completion/Debian/Command/_bts
@@ -85,16 +85,18 @@ case "$words[1]" in
       _wanted operator expl 'operator' compadd - '+' '-' '='
     elif [[ CURRENT -eq 4 ]]; then
       _wanted tag expl 'tag' \
-	 compadd patch wontfix moreinfo unreproducible fixed security \
-	 potato woody sid help pending upstream lfs sarge experimental \
-	 sarge-ignore d-i confirmed ipv6 fixed-in-experimental \
-	 fixed-upstream
+	 compadd patch wontfix moreinfo unreproducible help pending \
+	 fixed security upstream confirmed fixed-upstream \
+	 fixed-in-experimental d-i ipv6 lfs l10n potato woody sarge \
+	 sarge-ignore etch etch-ignore lenny lenny-ignore squeeze \
+	 squeeze-ignore wheezy wheezy-ignore sid experimental
     else
       _wanted tag expl 'tag' \
-	 compadd patch wontfix moreinfo unreproducible fixed security \
-	 potato woody sid help pending upstream lfs sarge experimental \
-	 sarge-ignore d-i confirmed ipv6 fixed-in-experimental \
-	 fixed-upstream
+	 compadd patch wontfix moreinfo unreproducible help pending \
+	 fixed security upstream confirmed fixed-upstream \
+	 fixed-in-experimental d-i ipv6 lfs l10n potato woody sarge \
+	 sarge-ignore etch etch-ignore lenny lenny-ignore squeeze \
+	 squeeze-ignore wheezy wheezy-ignore sid experimental
       _wanted sep expl 'separator' compadd -S ' ' , .
     fi
   ;;
diff --git a/Completion/Debian/Command/_git-buildpackage b/Completion/Debian/Command/_git-buildpackage
index 784d53028..a2dc65689 100644
--- a/Completion/Debian/Command/_git-buildpackage
+++ b/Completion/Debian/Command/_git-buildpackage
@@ -1,4 +1,5 @@
 #compdef git-buildpackage
+#description build Debian packages from a git repository
 
 _arguments \
   '--version[show program version number and exit]' \
@@ -30,7 +31,7 @@ _arguments \
   '--git-prebuild=-[command to run before a build]:command:' \
   '--git-postbuild=-[hook run after a successful build]:command:' \
   '--git-posttag=-[hook run after a successful tag operation]:command:' \
-  '--git-pbuilder[Invoke git-pbuilder for building]' \
+  '--git-pbuilder[invoke git-pbuilder for building]' \
   '--git-no-pbuilder[negates --git-pbuilder]' \
   '--git-dist=-[build for this distribution when using git-pbuilder]:distribution:' \
   '--git-arch=-[build for this architecture when using git-pbuilder]:architecture:' \