diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a73a033731b..4274f3a1b36 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-14  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	PR gdb/21574
+	* infcmd.c (_initialize_infcmd): Expand "help run" documentation
+	to mention $SHELL and startup-with-shell.
+
 2017-06-14  Max Filippov  <jcmvbkbc@gmail.com>
 
 	* MAINTAINERS: Move Maxim Grigoriev to the Past Maintainers.
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index db09f19699d..d55163960f2 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -3400,13 +3400,16 @@ Specifying -a and an ignore count simultaneously is an error."));
 
   c = add_com ("run", class_run, run_command, _("\
 Start debugged program.  You may specify arguments to give it.\n\
-Args may include \"*\", or \"[...]\"; they are expanded using \"sh\".\n\
-Input and output redirection with \">\", \"<\", or \">>\" are also \
-allowed.\n\n\
+Args may include \"*\", or \"[...]\"; they are expanded using the\n\
+shell that will start the program (specified by the \"$SHELL\"\
+environment\nvariable).  Input and output redirection with \">\",\
+\"<\", or \">>\"\nare also allowed.\n\n\
 With no arguments, uses arguments last specified (with \"run\" \
 or \"set args\").\n\
 To cancel previous arguments and run with no arguments,\n\
-use \"set args\" without arguments."));
+use \"set args\" without arguments.\n\
+To start the inferior without using a shell, use \"set \
+startup-with-shell off\"."));
   set_cmd_completer (c, filename_completer);
   add_com_alias ("r", "run", class_run, 1);