diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7470df8dbe7..2d86cc2c1ec 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* variables.texi (Defining Variables): Add an index entry for
+	`set-variable' (bug#7262).
+
 	* frames.texi (Basic Parameters): Document the `explicit-name'
 	parameter (bug#6951).
 
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 08712466b5c..a007a4d9cc3 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -466,6 +466,7 @@ the main benefits of defining the variable.)  The documentation is
 stored in the symbol's @code{variable-documentation} property.  The
 Emacs help functions (@pxref{Documentation}) look for this property.
 
+
 If the documentation string begins with the character @samp{*}, Emacs
 allows users to set it interactively using the @code{set-variable}
 command.  However, you should nearly always use @code{defcustom}
@@ -584,6 +585,7 @@ is a user option.  Aliases of user options are also user options.
 @end defun
 
 @kindex variable-interactive
+@kindex set-variable
   If a user option variable has a @code{variable-interactive} property,
 the @code{set-variable} command uses that value to control reading the
 new value for the variable.  The property's value is used as if it were