diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 6ca2a27e87..240ba890ab 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-01  Pedro Alves  <pedro@codesourcery.com>
+
+	* gdb.texinfo (Create and Delete Tracepoints): Add more index
+	entries for fast tracepoints and static tracepoints.
+
 2010-07-01  Pedro Alves  <pedro@codesourcery.com>
 
 	* gdb.texinfo (General Query Packets) <qfThreadInfo,
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 9089477179..7abb9ed9a2 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -9680,6 +9680,7 @@ information on tracepoint conditions.
 
 @item ftrace @var{location} [ if @var{cond} ]
 @cindex set fast tracepoint
+@cindex fast tracepoints, setting
 @kindex ftrace
 The @code{ftrace} command sets a fast tracepoint.  For targets that
 support them, fast tracepoints will use a more efficient but possibly
@@ -9693,7 +9694,9 @@ message.
 @code{trace}.
 
 @item strace @var{location} [ if @var{cond} ]
-@cindex static tracepoint, setting
+@cindex set static tracepoint
+@cindex static tracepoints, setting
+@cindex probe static tracepoint marker
 @kindex strace
 The @code{strace} command sets a static tracepoint.  For targets that
 support it, setting a static tracepoint probes a static