diff --git a/share/completions/umount.fish b/share/completions/umount.fish
index fedf007d4..f15d0ba3e 100644
--- a/share/completions/umount.fish
+++ b/share/completions/umount.fish
@@ -7,15 +7,15 @@
 #
 complete -c umount -d "Mount point" -x -a '(__fish_print_mounted)'
 
-complete -c umount -s V -d "Display version and exit"
-complete -c umount -s h -d "Display help and exit"
-complete -c umount -s v -d "Verbose mode"
-complete -c umount -s n -d "Unmount without writing in /etc/mtab"
-complete -c umount -s r -d "In case unmounting fails, try to remount read-only"
-complete -c umount -s d -d "In case the unmounted device was a loop device, also free this loop device"
-complete -c umount -s i -d "Don't call the /sbin/umount.<filesystem> helper even if it exists"
-complete -c umount -s a -d "Unmount all of the file systems described in /etc/mtab"
-complete -c umount -s t -d "Actions should only be taken on file systems of the specified type" -xa "(__fish_print_filesystems)"
-complete -c umount -s O -d "Actions should only be taken on file systems with the specified options in /etc/fstab" -xa '(cut -d " " -f 4 /etc/mtab)\t"Mount option"'
-complete -c umount -s f -d "Force unmount (in case of an unreachable NFS system)"
-complete -c umount -s l -d "Detach the filesystem from the filesystem hierarchy now, and cleanup all references to the filesystem as soon as it is not busy"
+complete -c umount -s V -l version -d "Display version and exit"
+complete -c umount -s h -l help -d "Display help and exit"
+complete -c umount -s v -l verbose -d "Verbose mode"
+complete -c umount -s n -l no-mtab -d "Unmount without writing in /etc/mtab"
+complete -c umount -s r -l read-only -d "In case unmounting fails, try to remount read-only"
+complete -c umount -s d -l detach-loop -d "In case the unmounted device was a loop device, also free this loop device"
+complete -c umount -s i -l internal-only -d "Don't call the /sbin/umount.<filesystem> helper even if it exists"
+complete -c umount -s a -l all -d "Unmount all of the file systems described in /etc/mtab"
+complete -c umount -s t -l types -d "Actions should only be taken on file systems of the specified type" -xa "(__fish_print_filesystems)"
+complete -c umount -s O -l test-opts -d "Actions should only be taken on file systems with the specified options in /etc/fstab" -xa '(cut -d " " -f 4 /etc/mtab)\t"Mount option"'
+complete -c umount -s f -l force -d "Force unmount (in case of an unreachable NFS system)"
+complete -c umount -s l -l lazy -d "Lazy unmount (unmount a 'busy' filesystem)"