2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/dired.el b/lisp/dired.el
index 350f6a7d2e3..2733372eb7b 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -59,6 +59,10 @@
 May contain all other options that don't contradict `-l';
 may contain even `F', `b', `i' and `s'.  See also the variable
 `dired-ls-F-marks-symlinks' concerning the `F' switch.
+Options that include embedded whitespace must be quoted
+like this: \\\"--option=value with spaces\\\"; you can use
+`combine-and-quote-strings' to produce the correct quoting of
+each option.
 On systems such as MS-DOS and MS-Windows, which use `ls' emulation in Lisp,
 some of the `ls' switches are not supported; see the doc string of
 `insert-directory' in `ls-lisp.el' for more details."
diff --git a/lisp/files.el b/lisp/files.el
index 2833ec5c124..03d6df4c037 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6582,7 +6582,7 @@ normally equivalent short `-D' option is just passed on to
                               (unless (equal switches "")
                                 ;; Split the switches at any spaces so we can
                                 ;; pass separate options as separate args.
-                                (split-string switches)))
+                                (split-string-and-unquote switches)))
                             ;; Avoid lossage if FILE starts with `-'.
                             '("--")
                             (progn