Index: en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
@@ -1829,8 +1829,8 @@
 		<entry>Name of the tag to download (2.0.1, hash, ...)
 		  Using the name of a branch here is incorrect.  It is
 		  also possible to use the hash of a commit id to do a
-		  snapshot</entry>
-		<entry><literal>${DISTVERSION}</literal></entry>
+		  snapshot.</entry>
+		<entry><literal>${DISTVERSIONFULL}</literal></entry>
 	      </row>
 	    </tbody>
 	  </tgroup>
@@ -1883,6 +1883,30 @@
 	    <literal>${WRKDIR}/pkg-6dbb17b</literal>.</para>
 	</example>
 
+	<example xml:id="makefile-master_sites-github-ex3">
+	  <title>Use of <varname>USE_GITHUB</varname> with
+	    <varname>DISTVERSIONPREFIX</varname></title>
+
+	  <para>From time to time, <varname>GH_TAGNAME</varname> is a
+	    slight variation from <varname>PORTREVISION</varname>.
+	    For example if the version is <literal>1.0.2</literal>,
+	    the tag is <literal>v1.0.2</literal>.  In those cases, it
+	    is possible to use <varname>DISTVERSIONPREFIX</varname> or
+	    <varname>DISTVERSIONSUFFIX</varname>:</para>
+
+	  <programlisting>PORTNAME=	foo
+PORTVERSION=	1.0.2
+DISTVERSIONPREFIX=	v
+
+USE_GITHUB=	yes</programlisting>
+
+	  <para>It will automatically set
+	    <varname>GH_TAGNAME</varname> to
+	    <literal>v1.0.2</literal>, while <varname>WRKSRC</varname>
+	    will be kept to
+	    <varname>${WRKDIR}/foo-1.0.2</varname>.</para>
+	</example>
+
       </sect3>
     </sect2>