diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index 453dd65a4e..9791952eb6 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -4363,7 +4363,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
       <qandaentry>
 	<question id="make-index">
 	  <para>I just tried to build <filename>INDEX</filename>
-	    using <command>make index</command>, and it failed.
+	    using <command>make <maketarget>index</maketarget></command>, and it failed.
 	    Why?</para>
 	</question>
 
@@ -4375,7 +4375,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 	    always fixed immediately.</para>
 
 	  <para>However, if you are up-to-date, perhaps you are seeing
-	    another problem.  <command>make index</command> has a
+	    another problem.  <command>make <maketarget>index</maketarget></command> has a
 	    known bug in dealing with incomplete copies of the Ports
 	    Collection.  It assumes that you have a local copy of every
 	    single port that every other port that you have a local copy
@@ -4385,11 +4385,11 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 	    <filename>baz/quux</filename>, then you must also have
 	    a copy of <filename>baz/quux</filename> on your disk, and
 	    the ports <filename>baz/quux</filename> depends on, and
-	    so on.  Otherwise, <command>make index</command> has
+	    so on.  Otherwise, <command>make <maketarget>index</maketarget></command> has
 	    insufficient information to create its dependency tree.</para>
 
 	  <para>This is particularly a problem for &os; users who
-	    utilize &man.cvsup.1; to track the Ports Collection but
+	    utilize &man.cvsup.1; (or &man.csup.1;) to track the Ports Collection but
 	    choose not to install certain categories by specifying
 	    them in <filename>refuse</filename>.  In theory, one
 	    should be able to refuse categories, but in practice
@@ -4405,7 +4405,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 	    <makevar>WITHOUT_<replaceable>*</replaceable></makevar>
 	    variables being set in <filename>make.conf</filename>.  If
 	    you suspect that this is the case, please try to make
-	    <filename>INDEX</filename> with those Makevars turned off
+	    <filename>INDEX</filename> with those make variables turned off
 	    before reporting it to &a.ports;.</para>
 	</answer>
       </qandaentry>