6 files changed, 39 insertions, 24 deletions
diff --git a/Completion/BSD/Command/_cu b/Completion/BSD/Command/_cu
index df38d6ed7..5876820e5 100644
--- a/Completion/BSD/Command/_cu
+++ b/Completion/BSD/Command/_cu
@@ -10,6 +10,7 @@ case $variant in
     args+=(
       "-d[don't block waiting for a carrier to be detected]"
       '-r[start cu in restricted mode - prevent local operations]'
+      '-E+[specify escape character]:escape character [~]'
     )
   ;;
   taylor|(net|free)bsd*)
@@ -18,7 +19,7 @@ case $variant in
       '(-e -P --parity)-o[use odd parity]'
     )
   ;|
-  (net|free)bsd*)
+  dragonfly*|(net|free)bsd*)
     args+=( '-t[connect via a hard-wired connection to a host on a dial-up line]' )
   ;|
   taylor|netbsd*)
@@ -53,12 +54,8 @@ case $variant in
       '(-e -o --parity)-P+[set parity]:parity [none]:(even odd none)'
     )
   ;;
-  freebsd*)
-    args=( -A "-*" $args
-      '-a[set the acu port]:acu'
-      '-h[echo characters locally]'
-    )
-  ;;
+  dragonfly*|freebsd*) args+=( '-a[set the acu port]:acu' ) ;|
+  freebsd*) args=( -A "-*" $args '-h[echo characters locally]' ) ;;
 esac
 
 _arguments -s $args \
diff --git a/Completion/BSD/Command/_gstat b/Completion/BSD/Command/_gstat
index c60e54422..238defce4 100644
--- a/Completion/BSD/Command/_gstat
+++ b/Completion/BSD/Command/_gstat
@@ -5,6 +5,7 @@ _arguments -s : \
   '(-B)-b[batch mode]' \
   '(-b)-B[endless batch mode]' \
   '-c[enable the display geom(4) consumers]' \
+  '(-b -B)-C[CSV output mode]' \
   '-d[enable the display delete operations]' \
   '-f+[filter by regex]:regex' \
   '-o[enable the display for other operations]' \
diff --git a/Completion/BSD/Command/_procstat b/Completion/BSD/Command/_procstat
index e16057635..a1708f6ac 100644
--- a/Completion/BSD/Command/_procstat
+++ b/Completion/BSD/Command/_procstat
@@ -6,8 +6,10 @@ _arguments -s -A "-*" -S \
   '-e[show environment variables]' \
   '-f[show file descriptor information]' \
   '-i[show signal pending and disposition]' \
+  '-j[show signal pending and blocked information for process threads]' \
   '-k[show stacks of kernel threads]' \
   '-l[show resource limits]' \
+  "-L[show LWP info for the process pertaining to it's signal driven exit]" \
   '-r[show resource usage]' \
   '-s[show security credential information]' \
   '-S[show cpuset information]' \
diff --git a/Completion/BSD/Command/_signify b/Completion/BSD/Command/_signify
index 26571aa2a..6a786e2e1 100644
--- a/Completion/BSD/Command/_signify
+++ b/Completion/BSD/Command/_signify
@@ -3,29 +3,30 @@
 _arguments -s -S -A "-*" : \
   - checksum \
   '-C[verify a signed checksum list and the checksum for each file]' \
-  '-p[public key]:public key:_files' \
+  '-p+[public key]:public key:_files' \
   '-q[quiet mode]' \
-  '-x[signature file]:signature file:_files' \
+  '-x+[specify signature file]:signature file:_files' \
   '*:file:_files' \
   - generate \
   '-G[generate a new key pair]' \
-  '-c[specify comment]:comment:' \
-  '-n[do not ask for passphrase]' \
-  '-p[public key]:public key:_files' \
-  '-s[secret key]:secret key:_files' \
+  '-c+[specify comment]:comment' \
+  "-n[don't ask for passphrase]" \
+  '-p+[specify public key file]:public key:_files' \
+  '-s+[specify secret key file]:secret key:_files' \
   - sign \
   '-S[sign a message and create a signature]' \
   '-e[embed the message after the signature]' \
-  '-m[file containing message]:message file:_files' \
-  '-s[secret key]:secret key:_files' \
-  '-x[signature file]:signature file:_files' \
+  '-n[store a zero time stamp in the gzip(1) header (with -z)]' \
+  '-m+[specify file containing message to sign]:message file:_files' \
+  '-s+[specify secret key file]:secret key:_files' \
+  '-x+[specify signature file]:signature file:_files' \
   '-z[embed signature in gzip header]' \
   - verify \
   '-V[verify the message and signature match]' \
   '-e[extract the message from the signature]' \
-  '-m[file containing message to verify or destination to extract]:message file:_files' \
-  '-p[public key]:public key:_files' \
+  '-m+[specify file containing message to verify or destination to extract]:message file:_files' \
+  '-p+[specify public key file]:public key:_files' \
   '-q[quiet mode]' \
-  '-t[restrict verification to specified key type]:key type:((base\:"base sets" fw\:firmware pkg\:packages syspatch\:syspatches))' \
-  '-x[signature file]:signature file:_files' \
+  '-t+[restrict verification to specified key type]:key type:((base\:"base sets" fw\:firmware pkg\:packages syspatch\:syspatches))' \
+  '-x+[specify signature file]:signature file:_files' \
   '-z[verify signature in gzip header]'
diff --git a/Completion/BSD/Command/_sockstat b/Completion/BSD/Command/_sockstat
index 913f3eb05..1d7973db7 100644
--- a/Completion/BSD/Command/_sockstat
+++ b/Completion/BSD/Command/_sockstat
@@ -13,6 +13,14 @@ case $OSTYPE in
       '-u[show AF_LOCAL (UNIX) sockets]'
     )
   ;|
+  freebsd<12->.*)
+    args+=(
+      '-S[display the protocol stack if applicable]'
+      '-U[display the remote UDP encapsulation port number if applicable]'
+      '-v[verbose mode]'
+      '-w[use wider field size for displaying addresses]'
+    )
+  ;|
   freebsd*)
     for proto in ${${(M)${(f)"$(</etc/protocols)"}##[a-z0-9]*}}; do
       case $proto in
diff --git a/Completion/BSD/Command/_vmctl b/Completion/BSD/Command/_vmctl
index 66d9081b0..d22657310 100644
--- a/Completion/BSD/Command/_vmctl
+++ b/Completion/BSD/Command/_vmctl
@@ -29,6 +29,7 @@ subcommands=(
   start:'start a VM'
   stop:'stop a VM'
   unpause:'resume a VM'
+  wait:'wait until specified VM has stopped'
 )
 
 if (( CURRENT == 2 )); then
@@ -37,7 +38,7 @@ else
   local curcontext="${curcontext%:*}-${words[2]}:"
   shift words; (( CURRENT-- ))
   case $words[1] in
-    console|pause|send|show|status|unpause)
+    console|pause|send|show|status|unpause|wait)
       _vm_names
       ;;
     create)
@@ -50,7 +51,8 @@ else
 	shift words; (( CURRENT-- ))
 	_arguments \
 	  '-s+[specify size]:size' \
-	  '-b+[specify base disk]:base image:_files'
+          '(-i)-b+[specify base disk]:base image:_files'
+          '(-b)-i+[copy and convert input disk]:disk image:_files'
       fi
       ;;
     load)
@@ -75,14 +77,15 @@ else
       else
         shift words; (( CURRENT-- ))
         _arguments -s \
+          '-B+[force system to boot from specified device for this boot]:device:(cdrom disk net)' \
           '-b+[boot with the specified kernel or BIOS image]:boot image:_files' \
           '-c[automatically connect to the VM console]' \
           '*-d+[disk image file]:disk image:_files' \
           '-i+[number of network interfaces]:number: ' \
           '-L[add a local network interface]' \
-          '-m+[memory size in megabytes]:megabytes: ' \
+          '-m+[specify memory size]:memory size (megabytes) [512]' \
           '-n+[specify switch to attach]: :_vm_switches' \
-	  '-r+[ISO image file for virtual CD-ROM]:ISO image:_files' \
+          '-r+[specify ISO image file for virtual CD-ROM]:ISO image:_files -g "*.iso(-.)"' \
 	  '-t+[use existing VM as a template]: :_vm_names'
       fi
     ;;
@@ -98,5 +101,8 @@ else
 	  '-w[wait until the VM has been terminated]'
       fi
     ;;
+    *)
+      _default
+    ;;
   esac
 fi