diff --git a/doc/howto/index.rst b/doc/howto/index.rst
index 186edc2729d..9f9f27a24d7 100644
--- a/doc/howto/index.rst
+++ b/doc/howto/index.rst
@@ -29,6 +29,7 @@ These guides will help you use Dune's features in your project.
    homebrew-package
    use-opam-alongside-dune-package-management
    configure-editors-with-package-management
+   shell-completion
    set-up-ci-with-package-management
    customize-dev-tools-lock-directories
    use-multiple-build-contexts
diff --git a/doc/howto/shell-completion.md b/doc/howto/shell-completion.md
new file mode 100644
index 00000000000..4bdbd51da5b
--- /dev/null
+++ b/doc/howto/shell-completion.md
@@ -0,0 +1,48 @@
+How to Set Up Shell Command Completion
+======================================
+
+Shell command completion refers to a common feature in various shells:
+hitting \<TAB\> after a partially-typed command will print matching suggestions.
+This can apply to command names, flags, arguments, filenames...
+
+Dune offers completion for commands, subcommands, and flags, for `bash`, `zsh`, and `powershell`.
+The various shells and systems require specific configuration setups,
+and this document aims to help users get completion running.
+
+Bash
+----
+
+Command completion for bash might require [bash-completion](https://github.com/scop/bash-completion).
+You will then need to create the bash completion script (by running `dune completion bash`)
+and write that script to an appropriate place: by default that should be
+`~/.local/share/bash-completion/completions/dune` for a user-local configuration,
+or `/usr/local/share/bash-completion/completions/dune` for a system-wide installation.
+If you use `opam` switches and wish to have switch-local completion,
+add the script to `<switch prefix>/share/bash-completion/completions/dune`.
+
+A different path would be to add to your `.bashrc` the following line: `eval "$(dune completion bash)"`.
+
+You might need to restart your shell to see the effects.
+
+Zsh
+---
+
+Command completion for zsh might require [zsh-completions](https://github.com/zsh-users/zsh-completions).
+You will then need to create the zsh completion script (by running `dune completion zsh`)
+and write that script to a place that will get autoloaded: directories present
+in your `$fpath` (by default it should be `~/.local/share/zsh/site-functions`).
+If you wish to create a dedicated completion directory and add it to your `$fpath`,
+be sure to add the following in your `.zshrc` but **before** any call to `compinit`:
+`fpath+=<your dir>`.
+
+You might need to restart your shell to see the effects.
+
+PowerShell
+----------
+
+Command completion for powershell should work out of the box:
+simply run `dune completion powershell >> $PROFILE.CurrentUserCurrentHost`.
+Alternatively, add the following to your profile script:
+`dune completion powershell | Out-String | Invoke-Expression`.
+
+You might need to restart your shell to see the effects.