diff --git a/share/completions/ulimit.fish b/share/completions/ulimit.fish
index 50219a9d2..842551e75 100644
--- a/share/completions/ulimit.fish
+++ b/share/completions/ulimit.fish
@@ -2,7 +2,7 @@
 complete -c ulimit -s S -l soft -d "Set or get soft limit"
 complete -c ulimit -s H -l hard -d "Set or get hard limit"
 
-complete -c ulimit -s a -l all -d "Set or get all current limits"
+complete -c ulimit -s a -l all -d "Get all current limits"
 complete -c ulimit -s c -l core-size -d "Maximum size of core files created"
 complete -c ulimit -s d -l data-size -d "Maximum size of a process's data segment"
 complete -c ulimit -s f -l file-size -d "Maximum size of files created by the shell"
diff --git a/share/completions/umask.fish b/share/completions/umask.fish
new file mode 100644
index 000000000..ca92fa430
--- /dev/null
+++ b/share/completions/umask.fish
@@ -0,0 +1,3 @@
+complete -c umask -s S -l symbolic -x -d 'Gets the umask in symbolic format instead of octal'
+complete -c umask -s p -l as-command -x -d 'Gets the umask in a format that can be used as a command'
+complete -c umask -s h -l help -x -d 'Display help and exit'