diff --git a/share/completions/and.fish b/share/completions/and.fish
new file mode 100644
index 000000000..d35499645
--- /dev/null
+++ b/share/completions/and.fish
@@ -0,0 +1,2 @@
+
+complete -c and -s h -l help -d (N_ "Display help and exit" )
diff --git a/share/completions/bg.fish b/share/completions/bg.fish
new file mode 100644
index 000000000..626601527
--- /dev/null
+++ b/share/completions/bg.fish
@@ -0,0 +1,2 @@
+
+complete -c bg -s h -l help -d (N_ "Display help and exit" )
diff --git a/share/completions/bind.fish b/share/completions/bind.fish
new file mode 100644
index 000000000..39a4ce5cc
--- /dev/null
+++ b/share/completions/bind.fish
@@ -0,0 +1,3 @@
+
+complete -c bind -s h -l help -d (N_ "Display help and exit" 
+complete -c bind -s M -l set-mode -d (N_ "Change input mode" )
diff --git a/share/completions/block.fish b/share/completions/block.fish
new file mode 100644
index 000000000..389f7e947
--- /dev/null
+++ b/share/completions/block.fish
@@ -0,0 +1,5 @@
+
+complete -c block -s h -l help -d (N_ "Display help and exit" )
+complete -c block -s e -l erase -d (N_ "Remove the topmost global event block" )
+complete -c block -s l -l local -d (N_ "Create a local (automatically erased) event block" )
+complete -c block -s g -l global -d (N_ "Create a global (manually erased) event block" )
diff --git a/share/completions/break.fish b/share/completions/break.fish
new file mode 100644
index 000000000..3da5aa1b7
--- /dev/null
+++ b/share/completions/break.fish
@@ -0,0 +1,2 @@
+
+complete -c break -s h -l help -d (N_ "Display help and exit" )
diff --git a/share/completions/builtin.fish b/share/completions/builtin.fish
new file mode 100644
index 000000000..240e4dc35
--- /dev/null
+++ b/share/completions/builtin.fish
@@ -0,0 +1,3 @@
+
+complete -c builtin -s h -l help -d (N_ "Display help and exit" )
+complete -c builtin -s n -l names -d (N_ "Print names of all existing builtins" )
diff --git a/share/completions/case.fish b/share/completions/case.fish
new file mode 100644
index 000000000..474d84174
--- /dev/null
+++ b/share/completions/case.fish
@@ -0,0 +1,2 @@
+
+complete -c case -s h -l help -d (N_ "Display help and exit" )
diff --git a/share/completions/cd.fish b/share/completions/cd.fish
index ff34cee4c..1b8ac9796 100644
--- a/share/completions/cd.fish
+++ b/share/completions/cd.fish
@@ -1,2 +1,3 @@
 
 complete -x -c cd -a "(__fish_complete_cd)"
+complete -c cd -s h -l help -d (N_ "Display help and exit" )
diff --git a/share/completions/command.fish b/share/completions/command.fish
new file mode 100644
index 000000000..a96220ca3
--- /dev/null
+++ b/share/completions/command.fish
@@ -0,0 +1,2 @@
+
+complete -c command -s h -l help -d (N_ "Display help and exit" )
diff --git a/share/completions/commandline.fish b/share/completions/commandline.fish
index ebefe1706..476df8e69 100644
--- a/share/completions/commandline.fish
+++ b/share/completions/commandline.fish
@@ -1,3 +1,5 @@
+
+complete -c commandline -s h -l help -d (N_ "Display help and exit")
 complete -c commandline -s a -l append -d (N_ "Add text to the end of the selected area")
 complete -c commandline -s i -l insert -d (N_ "Add text at cursor")
 complete -c commandline -s r -l replace -d (N_ "Replace selected part")
diff --git a/share/completions/continue.fish b/share/completions/continue.fish
new file mode 100644
index 000000000..ba2715796
--- /dev/null
+++ b/share/completions/continue.fish
@@ -0,0 +1,3 @@
+
+complete -c continue -s h -l help -d (N_ "Display help and exit" )
+
diff --git a/share/completions/eval.fish b/share/completions/eval.fish
new file mode 100644
index 000000000..36f346d7f
--- /dev/null
+++ b/share/completions/eval.fish
@@ -0,0 +1,2 @@
+
+complete -c eval -s h -l help -d (N_ "Display help and exit" )
diff --git a/share/completions/exec.fish b/share/completions/exec.fish
new file mode 100644
index 000000000..5fbd4ce54
--- /dev/null
+++ b/share/completions/exec.fish
@@ -0,0 +1,2 @@
+
+complete -c exec -s h -l help -d (N_ "Display help and exit" )
diff --git a/share/completions/exit.fish b/share/completions/exit.fish
new file mode 100644
index 000000000..25b84e665
--- /dev/null
+++ b/share/completions/exit.fish
@@ -0,0 +1,4 @@
+
+complete -c exit -s h -l help -d (N_ "Display help and exit" )
+complete -c exit -x -a 0 -d "Quit with normal exit status"
+complete -c exit -x -a 1 -d "Quit with abnormal exit status"
diff --git a/share/completions/fg.fish b/share/completions/fg.fish
new file mode 100644
index 000000000..4da3db54a
--- /dev/null
+++ b/share/completions/fg.fish
@@ -0,0 +1,2 @@
+
+complete -c fg -s h -l help -d (N_ "Display help and exit" )
diff --git a/share/completions/jobs.fish b/share/completions/jobs.fish
index e9e2b0b2a..8b4039d9c 100644
--- a/share/completions/jobs.fish
+++ b/share/completions/jobs.fish
@@ -1,5 +1,6 @@
 
 
+complete -c jobs -s h -l help -d (N_ "Display help and exit" )
 complete -c jobs -s p -l pid -d (N_ "Show the process id of each process in the job")
 complete -c jobs -s g -l group -d (N_ "Show group id of job")
 complete -c jobs -s c -l command -d (N_ "Show commandname of each job")
diff --git a/share/completions/not.fish b/share/completions/not.fish
new file mode 100644
index 000000000..c58220ba0
--- /dev/null
+++ b/share/completions/not.fish
@@ -0,0 +1,2 @@
+
+complete -c not -s h -l help -d (N_ "Display help and exit" )
diff --git a/share/completions/or.fish b/share/completions/or.fish
new file mode 100644
index 000000000..20fa6c13e
--- /dev/null
+++ b/share/completions/or.fish
@@ -0,0 +1,2 @@
+
+complete -c or -s h -l help -d (N_ "Display help and exit" )
diff --git a/share/completions/random.fish b/share/completions/random.fish
new file mode 100644
index 000000000..297e14d4f
--- /dev/null
+++ b/share/completions/random.fish
@@ -0,0 +1,2 @@
+
+complete -c random -s h -l help -d (N_ "Display help and exit" )
diff --git a/share/completions/return.fish b/share/completions/return.fish
new file mode 100644
index 000000000..21fd97849
--- /dev/null
+++ b/share/completions/return.fish
@@ -0,0 +1,4 @@
+
+complete -c return -s h -l help -d (N_ "Display help and exit" )
+complete -c return -x -a 0 -d "Return from function with normal exit status"
+complete -c return -x -a 1 -d "Return from function with abnormal exit status"
diff --git a/share/completions/status.fish b/share/completions/status.fish
index 4c1b2e841..0055128f9 100644
--- a/share/completions/status.fish
+++ b/share/completions/status.fish
@@ -1,4 +1,5 @@
 
+complete -c status -s h -l help -d (N_ "Display help and exit" )
 complete -c status -l is-command-substitution -d (N_ "Test if a command substitution is currently evaluated")
 complete -c status -l is-block -d (N_ "Test if a code block is currently evaluated")
 complete -c status -l is-interactive -d (N_ "Test if this is an interactive shell")