diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 1472beb62f..a3d2266c0e 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-18  Tom Tromey  <tromey@redhat.com>
+
+	* gdb.texinfo (File Options): Document -x on .py files.
+	(Command Files): Document handling of Python scripts.
+
 2010-01-18  Jie Zhang  <jie.zhang@analog.com>
 
 	* Makefile.in (ANNOTATE_DOC_BUILD_INCLUDES): Add GDBvn.texi.
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 7cf1bb4464..d37712b5df 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -963,8 +963,11 @@ Connect to process ID @var{number}, as with the @code{attach} command.
 @itemx -x @var{file}
 @cindex @code{--command}
 @cindex @code{-x}
-Execute @value{GDBN} commands from file @var{file}.  @xref{Command
-Files,, Command files}.
+Execute commands from file @var{file}.  If @var{file} ends in
+@samp{.py}, then the file is evaluated as Python code.  If Python
+support is not enabled in this @value{GDBN}, then the file is assumed to
+contain @value{GDBN} commands, regardless of its extension.
+@xref{Command Files,, Command files}.
 
 @item -eval-command @var{command}
 @itemx -ex @var{command}
@@ -19159,6 +19162,11 @@ If @code{-v}, for verbose mode, is given then @value{GDBN} displays
 each command as it is executed.  The option must be given before
 @var{filename}, and is interpreted as part of the filename anywhere else.
 
+If @var{filename} ends in @samp{.py}, then @value{GDBN} evaluates the
+contents of the file as Python code.  If Python support is not compiled
+in to @value{GDBN}, then the file is assumed to contain @value{GDBN}
+commands, regardless of its extension.
+
 Commands that would ask for confirmation if used interactively proceed
 without asking when used in a command file.  Many @value{GDBN} commands that
 normally print messages to say what they are doing omit the messages