diff --git a/share/completions/chsh.fish b/share/completions/chsh.fish
index 31afe4002..3dbbdd7c9 100644
--- a/share/completions/chsh.fish
+++ b/share/completions/chsh.fish
@@ -8,3 +8,8 @@ complete -c chsh -s u -l help -d "Display help and exit	"
 complete -c chsh -s v -l version -d "Display version and exit"
 complete -x -c chsh -a "(__fish_complete_users)"
 
+# util-linux's chsh also has a "-l"/"--list-shells" option.
+# While both FreeBSD and macOS also have "-l", it means something different and probably uninteresting.
+if set -l chshversion (chsh --version ^/dev/null); and string match -qr '.*util-linux.*' -- $chshversion
+    complete -f -c chsh -s l -l list-shells -d "List available shells and exit"
+end