diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6c03b88..b4193019 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,8 @@
   sequences (https://codeberg.org/dnkl/foot/issues/235).
 * Support for transparent sixels (DCS parameter `P2=1`)
   (https://codeberg.org/dnkl/foot/issues/391).
+* `-N,--no-wait` to `footclient`
+  (https://codeberg.org/dnkl/foot/issues/395).
 
 
 ### Changed
diff --git a/completions/fish/footclient.fish b/completions/fish/footclient.fish
index 09dc7305..826508ef 100644
--- a/completions/fish/footclient.fish
+++ b/completions/fish/footclient.fish
@@ -10,6 +10,7 @@ complete -c footclient -x -s w -l window-size-pixels
 complete -c footclient -x -s W -l window-size-chars                                                         -d "window WIDTHxHEIGHT, in characters (not set)"
 complete -c footclient -F -s s -l server-socket                                                             -d "override the default path to the foot server socket ($XDG_RUNTIME_DIR/foot-$WAYLAND_DISPLAY.sock)"
 complete -c footclient    -s H -l hold                                                                      -d "remain open after child process exits"
+complete -c footclient    -s N -l no-wait                                                                   -d "detach the client process from the running terminal, exiting immediately"
 complete -c footclient -x -s d -l log-level          -a "info warning error"                                -d "log-level (info)"
 complete -c footclient -x -s l -l log-colorize       -a "always never auto"                                 -d "enable or disable colorization of log output on stderr"
 complete -c footclient    -s v -l version                                                                   -d "show the version number and quit"
diff --git a/completions/zsh/_footclient b/completions/zsh/_footclient
index f8537748..411d4ec5 100644
--- a/completions/zsh/_footclient
+++ b/completions/zsh/_footclient
@@ -13,6 +13,7 @@ _arguments \
     '(-W --window-size-chars)'{-W,--window-size-chars}'[window WIDTHxHEIGHT, in characters (not set)]:size_chars:()' \
     '(-s --server-socket)'{-s,--server-socket}'[override the default path to the foot server socket ($XDG_RUNTIME_DIR/foot-$WAYLAND_DISPLAY.sock)]:server:_files' \
     '(-H --hold)'{-H,--hold}'[remain open after child process exits]' \
+    '(-N --no-wait)'{-N,--no-wait}'[detach the client process from the running terminal, exiting immediately]' \
     '(-d --log-level)'{-d,--log-level}'[log level (info)]:loglevel:(info warning error)' \
     '(-l --log-colorize)'{-l,--log-colorize}'[enable or disable colorization of log output on stderr]:logcolor:(never always auto)' \
     '(-v --version)'{-v,--version}'[show the version number and quit]' \
diff --git a/doc/footclient.1.scd b/doc/footclient.1.scd
index 107e6eaa..900668a2 100644
--- a/doc/footclient.1.scd
+++ b/doc/footclient.1.scd
@@ -60,6 +60,10 @@ terminal has terminated).
 *-H*,*--hold*
 	Remain open after child process exits.
 
+*-N*,*--no-wait*
+	Detach the client process from the running terminal, exiting
+	immediately.
+
 *-d*,*--log-level*={*info*,*warning*,*error*}
 	Log level, used both for log output on stderr as well as
 	syslog. Default: _info_.