diff --git a/src/_blkid b/src/_blkid
index 7afccc6..e109545 100644
--- a/src/_blkid
+++ b/src/_blkid
@@ -27,7 +27,8 @@
 # Description
 # -----------
 #
-# Completion for blkid (locate/print block device attributes) from util-linux
+# Completion for blkid, util-linux 2.40.2 (https://github.com/util-linux/util-linux/)
+# - locate/print block device attributes
 # https://man7.org/linux/man-pages/man8/blkid.8.html
 # ------------------------------------------------------------------------------
 # Authors
@@ -36,18 +37,26 @@
 # ------------------------------------------------------------------------------
 
 _arguments \
-  '(-h --help)'{-h,--help}'[display help message and exit]' \
-  '(-V --version)'{-V,--version}'[display version information and exit]' \
-  '(-c --cache)'{-c+,--cache=}'[specify cache file]:cache file:_files' \
-  '(-o --output)'{-o+,--output=}'[specify output format]:format:(full value device export udev)' \
-  '--output-uuid[print only UUIDs]' \
-  '--output-label[print only labels]' \
-  '--match-token=[search for devices with specific tokens]:token (e.g. UUID= or LABEL=)' \
-  '--match-tag=[search for devices with a tag name]:tag name' \
-  '--probe[use low-level probing on devices]' \
-  '--match-types=[limit probing to specific filesystem types]:filesystem types' \
-  '(-d --no-encoding)'{-d,--no-encoding}'[do not encode non-printable characters]' \
-  '--list-one[print only the first device found]' \
+  '(-c --cache-file)'{-c+,--cache-file}'[Read from cachefile instead of reading from the default cache file]:cache file:_files' \
+  '(-d --no-encoding)'{-d,--no-encoding}"[Don't encode non-printing characters]" \
+  '(-D --no-part-details)'{-D,--no-part-details}"[Don't print information from partition table in low-level probing mode]" \
+  '(-g --garbage-collect)'{-g,--garbage-collect}'[Perform a garbage collection on the blkid cache]' \
+  '(-H --hint)'{-H,--hint}'[Set probing hint]:setting' \
+  '(-i --info)'{-i,--info}'[Display information about I/O limits]' \
+  '(-k --list-filesystems)'{-k,--list-filesystems}'[List all known filesystems and RAIDS and exits]' \
+  '(-l --list-one)'{-l,--list-one}'[Look up only one device that matches with the --match-token option]' \
+  '(-L --label)'{-L+,--label}'[Look up the device that uses this filesystem label]:label' \
+  '(-n --match-types)'{-n+,--match-types}'[Restrict the probing functions to the specified comma-separated list of superblock types]:list' \
+  '(-o --output)'{-o+,--output}'[Use the specified output format]:format:(full value list device udev export)' \
+  '(-O --offset)'{-O+,--offset}'[Probe at the given offset]:offset' \
+  '(-p --probe)'{-p,--probe}'[Switch to low-level superblock probing mode]' \
+  '(-s --match-tag)'{-m+,--match-tag}'[Show only the tags that match tag]:tag' \
+  '(-S --size)'{-S,--size}'[Override the size of device/file]' \
+  '(-t --match-token)'{-t+,--match-token}'[Search for block devices with tokens named NAME that have the VALUE]:name' \
+  '(-u --usages)'{-u,--usages}'[Restrict the probing functions to the specified comma-separated list of usage types]:list' \
+  '(-U --uuid)'{-U,--uuid}'[Look up the device that uses this filesystem uuid]:uuid' \
+  '(- *)'{-h,--help}'[Display help text and exit]' \
+  '(- *)'{-V,--version}'[Print version and exit]' \
   '*:device:_files -g /dev'
 
 # Local Variables:
diff --git a/src/_chmem b/src/_chmem
index f1e9f9a..2e0753f 100644
--- a/src/_chmem
+++ b/src/_chmem
@@ -42,7 +42,7 @@ _arguments -s \
   '(-z --zone)'{-z,--zone}'[Select the memory ZONE where to set the specified RANGE, SIZE, or BLOCKRANGE of memory online or offline]' \
   '(-v --verbose)'{-v,--verbose}'[Verbose mode]' \
   '(- *)'{-h,--help}'[Display help text and exit]' \
-  '(- *)'{-V,--version}'[Print version and exit ]'
+  '(- *)'{-V,--version}'[Print version and exit]'
 
 # Local Variables:
 # mode: Shell-Script
diff --git a/src/_fallocate b/src/_fallocate
index 5317b14..1503e27 100644
--- a/src/_fallocate
+++ b/src/_fallocate
@@ -49,7 +49,7 @@ _arguments \
   '(-x --posix)'{-p,--posix}'[Enable POSIX operation mode]' \
   '(-z --zero-range)'{-z,--zero-range}'[Zeroes space in the byte range starting at offset and continuing for length bytes]' \
   '(- *)'{-h,--help}'[Display help text and exit]' \
-  '(- *)'{-V,--version}'[Print version and exit ]' \
+  '(- *)'{-V,--version}'[Print version and exit]' \
   '*:filename:_files'
 
 # Local Variables:
diff --git a/src/_ipcmk b/src/_ipcmk
index c40e43b..bee3b6e 100644
--- a/src/_ipcmk
+++ b/src/_ipcmk
@@ -41,7 +41,7 @@ _arguments -s \
   '(-S --semaphore)'{-S,--semaphore}'[Create a semaphore array with number of elements]:number' \
   '(-p --mode)'{-p,--mode}'[Access permissions for the resource]:mode' \
   '(- *)'{-h,--help}'[Display help text and exit]' \
-  '(- *)'{-V,--version}'[Print version and exit ]'
+  '(- *)'{-V,--version}'[Print version and exit]'
 
 # Local Variables:
 # mode: Shell-Script