Index: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
+++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
@@ -1517,18 +1517,18 @@
 
       <para>The Mesa Project is an effort to provide free OpenGL
 	implementation.  To specify a dependency on various
-	components of this project, use <varname>USE_GL</varname>.
-	Valid options are:
-	<literal>egl, gl, glesv2, glew, glu, glut, glw</literal> and
-	<literal>linux</literal>.  For backwards compatibility, the
-	value of <literal>yes</literal> maps to
-	<literal>glu</literal>.</para>
+	components of this project, use <literal>USES= gl</literal>
+	and <varname>USE_GL</varname>.  See
+	<xref linkend="uses-gl" /> for a full list of available
+	components.  For backwards compatibility, the value of
+	<literal>yes</literal> maps to <literal>glu</literal>.</para>
 
       <example xml:id="use-xorg-example">
 	<title><varname>USE_XORG</varname> Example</title>
 
-	<programlisting>USE_XORG=	xrender xft xkbfile xt xaw
-USE_GL=		glu</programlisting>
+	<programlisting>USES=		gl
+USE_GL=		glu
+USE_XORG=	xrender xft xkbfile xt xaw</programlisting>
       </example>
 
       <table frame="none" xml:id="using-xorg-variables">
@@ -1537,7 +1537,7 @@
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><varname>USES= imake</varname></entry>
+	      <entry><literal>USES= imake</literal></entry>
 	      <entry>The port uses <command>imake</command>.</entry>
 	    </row>
 
Index: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
@@ -708,7 +708,7 @@
 
 	<listitem>
 	  <para>add a library dependency on <filename>libEGL.so</filename>
-	    from <package role="port">graphics/mesai-libs</package></para>
+	    from <package role="port">graphics/mesa-libs</package></para>
 	</listitem>
       </varlistentry>