2 files changed, 10 insertions, 5 deletions
diff --git a/Completion/Debian/Command/_apt-move b/Completion/Debian/Command/_apt-move
index a72378e6f..6911ef6f1 100644
--- a/Completion/Debian/Command/_apt-move
+++ b/Completion/Debian/Command/_apt-move
@@ -1,6 +1,6 @@
 #compdef apt-move
 
-local curcontext="$curcontext" state line cmds ret=1
+local curcontext="$curcontext" state line expl cmds ret=1
 typeset -A opt_args
 
 _arguments -C \
@@ -45,7 +45,10 @@ case $state in
         _files -g "*.d(sc|eb)(-.)" && ret=0
       ;;
       listbin)
-        _wanted lists expl list compadd mirror sync repo
+        _wanted lists expl list compadd mirror sync repo && ret=0
+      ;;
+      *)
+	_default && ret=0
       ;;
     esac
   ;;
diff --git a/Completion/Debian/Command/_bts b/Completion/Debian/Command/_bts
index 4907d15c1..9f1f77bf4 100644
--- a/Completion/Debian/Command/_bts
+++ b/Completion/Debian/Command/_bts
@@ -40,10 +40,12 @@ case "$words[1]" in
   ;;
   (show|bugs)
     if [[ CURRENT -eq 2 ]]; then
-      _wanted package expl 'package' _deb_packages avail
-      _wanted maintainer expl 'package maintainer' compadd $DEBEMAIL
+      _alternative \
+	'packages:package:_deb_packages avail' \
+        "emails:package maintainer:compadd $DEBEMAIL"
+    else
+      _wanted sep expl 'separator' compadd -S ' ' , .
     fi
-    _wanted sep expl 'separator' compadd -S ' ' , .
   ;;
   reopen)
     if [[ CURRENT -eq 2 ]]; then