3 files changed, 6 insertions, 4 deletions
diff --git a/Completion/BSD/Command/_bsd_pkg b/Completion/BSD/Command/_bsd_pkg
index 25d4f346a..6bdce58e0 100644
--- a/Completion/BSD/Command/_bsd_pkg
+++ b/Completion/BSD/Command/_bsd_pkg
@@ -144,6 +144,7 @@ _bsd_pkg() {
     netbsd*)
       flags+=(
         '(:)-a[delete all installed packages]'
+        '(:)-A[remove automatically installed packages that are no longer required]'
         "-D[don't execute deinstallation scripts]"
         '-F[specify each package by an installed file]'
         '-f[force deinstallation]'
diff --git a/Completion/BSD/Command/_pkgin b/Completion/BSD/Command/_pkgin
index 5cb12baea..662bed181 100644
--- a/Completion/BSD/Command/_pkgin
+++ b/Completion/BSD/Command/_pkgin
@@ -26,7 +26,7 @@ _arguments -s -S -C \
   '*:: :->restargs' && ret=0
 
 if [[ -n $state ]]; then
-  cmds=( ${${${(f)"$(_call_program commands $pkgin -h 2>&1)"}[3,-1]/ -  (#b)(?)/:$match:l}%.} )
+  cmds=( ${${${(f)"$(_call_program commands $pkgin -h 2>&1)"}[3,-1]/ - (#b)(?)/:$match:l}%.} )
   short=( ${${cmds#*\(}/ #\)/} )
   cmds=( ${cmds// #\(*\)/} )
   if [[ $state = subcommands && ! -prefix - ]]; then
diff --git a/Completion/BSD/Command/_systat b/Completion/BSD/Command/_systat
index a123e081c..7d837790a 100644
--- a/Completion/BSD/Command/_systat
+++ b/Completion/BSD/Command/_systat
@@ -75,9 +75,10 @@ case $OSTYPE in
     opts=(
       '-M[alternative source to extract values from]:core:_files'
       '-N[alternative source to extract the name list from]:system:_files'
-      '-n[do not resolve IP addresses]'
-      '-w[refresh interval]:refresh interval'
-      '-t[the amount of refreshes for each screen in '\''all'\'' display mode]:turns'
+      '(-t -w)-b[show the chosen display once and exit]'
+      "-n[don't resolve IP addresses]"
+      '(-b)-w[refresh interval]:refresh interval'
+      "(-b)-t[specify amount of refreshes for each screen in 'all' display mode]:turns"
     )
 esac