diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51e9a603..bac42d03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ CHANGELOG
 
 0.51.0
 ------
+- Added `--with-shell` option to start child processes with a custom shell command and flags
+  ```sh
+  fzf --with-shell 'ruby -e' --preview 'puts {}.upcase.reverse'
+  ```
 - Added `change-multi` action for dynamically changing `--multi` option
     - `change-multi` - enable multi-select mode with no limit
     - `change-multi(NUM)` - enable multi-select mode with a limit
diff --git a/man/man1/fzf.1 b/man/man1/fzf.1
index 228d9d79..e8c836e3 100644
--- a/man/man1/fzf.1
+++ b/man/man1/fzf.1
@@ -819,8 +819,10 @@ e.g. \fBfzf --multi | fzf --sync\fR
 .RE
 .TP
 .B "--with-shell=STR"
-Shell command prefix to start child processes with. The default value is
-\fB$SHELL -c\fR if \fBSHELL\fR is set, otherwise \fBsh -c\fR on *nix systems.
+Shell command and flags to start child processes with. On *nix Systems, the
+default value is \fB$SHELL -c\fR if \fB$SHELL\fR is set, otherwise \fBsh -c\fR.
+On Windows, the default value is \fBcmd /v:on/s/c\fR when \fB$SHELL\fR is not
+set.
 
 .RS
 e.g. \fBfzf --with-shell 'ruby -e' --preview 'puts {}.upcase.reverse'\fR
diff --git a/src/options.go b/src/options.go
index 4584e284..a3666efe 100644
--- a/src/options.go
+++ b/src/options.go
@@ -120,7 +120,7 @@ const usage = `usage: fzf [options]
     --read0                Read input delimited by ASCII NUL characters
     --print0               Print output delimited by ASCII NUL characters
     --sync                 Synchronous search for multi-staged filtering
-    --with-shell=STR       Shell command prefix to start child processes with
+    --with-shell=STR       Shell command and flags to start child processes with
     --listen[=[ADDR:]PORT] Start HTTP server to receive actions (POST /)
                            (To allow remote process execution, use --listen-unsafe)
     --version              Display version information and exit