diff --git a/src/testdir/test_man.vim b/src/testdir/test_man.vim
index d2f48e8b0..f3af47744 100644
--- a/src/testdir/test_man.vim
+++ b/src/testdir/test_man.vim
@@ -132,4 +132,18 @@ func Test_keep_unnamed_register()
   %bw!
 endfunc
 
+" Check that underlying shell command arguments are escaped.
+func Test_Man_uses_shellescape()
+  Man `touch\ Xbar` `touch\ Xfoo`
+
+  redir => msg
+  1messages
+  redir END
+  call assert_match('no manual entry for "`touch Xfoo`"', msg)
+
+  call assert_false(filereadable('Xbar'))
+  call assert_false(filereadable('Xfoo'))
+endfunc
+
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index f1beb91f2..32c42a07d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1917,
 /**/
     1916,
 /**/