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
@@ -1654,15 +1654,16 @@
 	  Variables</title>
 
 	<para>Shortcut abbreviations are available for popular
-	  archives like SourceForge (<literal>SF</literal>), GNU
-	  (<literal>GNU</literal>), or Perl CPAN
-	  (<literal>CPAN</literal>).  <varname>MASTER_SITES</varname>
-	  can use them directly:</para>
+	  archives like SourceForge (<literal>SOURCEFORGE</literal>),
+	  GNU (<literal>GNU</literal>), or Perl CPAN
+	  (<literal>PERL_CPAN</literal>).
+	  <varname>MASTER_SITES</varname> can use them
+	  directly:</para>
 
 	<programlisting>MASTER_SITES=	GNU/make</programlisting>
 
 	<para>The older expanded format still works, but all ports
-	  should be converted to the compact format.  The expanded
+	  have been converted to the compact format.  The expanded
 	  format looks like this:</para>
 
 	<programlisting>MASTER_SITES=		${MASTER_SITE_GNU}
@@ -1687,6 +1688,70 @@
 
 	  <programlisting>MASTER_SITES=	<replaceable>FOO</replaceable>/<replaceable>bar</replaceable></programlisting>
 	</tip>
+
+	<note>
+	  <para>Some
+	    <varname>MASTER_SITE_<replaceable>*</replaceable></varname>
+	    names are quite long, and for ease of use, shortcuts have
+	    been defined:</para>
+
+	  <table frame="none" xml:id="makefile-master_sites-shortcut">
+	    <title>Shortcuts for
+	      <varname>MASTER_SITE_<replaceable>*</replaceable></varname>
+	      Macros</title>
+
+	    <tgroup cols="2">
+	      <thead>
+		<row>
+		  <entry>Macro</entry>
+		  <entry>Shortcut</entry>
+		</row>
+	      </thead>
+
+	      <tbody>
+		<row>
+		  <entry><varname>PERL_CPAN</varname></entry>
+		  <entry><varname>CPAN</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>GITHUB</varname></entry>
+		  <entry><varname>GH</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>GITHUB_CLOUD</varname></entry>
+		  <entry><varname>GHC</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>LIBREOFFICE_DEV</varname></entry>
+		  <entry><varname>LODEV</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>NETLIB</varname></entry>
+		  <entry><varname>NL</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>RUBYGEMS</varname></entry>
+		  <entry><varname>RG</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>SOURCEFORGE</varname></entry>
+		  <entry><varname>SF</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>SOURCEFORGE_JP</varname></entry>
+		  <entry><varname>SFJP</varname></entry>
+		</row>
+	      </tbody>
+	    </tgroup>
+	  </table>
+	</note>
       </sect3>
 
       <sect3 xml:id="makefile-master_sites-magic">
@@ -1714,7 +1779,7 @@
 MASTER_SITE_SUBDIR=	stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
 
 	<table frame="none" xml:id="makefile-master_sites-popular">
-	  <title>Popular Magic <varname>MASTER_SITES</varname>
+	  <title>Magic <varname>MASTER_SITES</varname>
 	    Macros</title>
 
 	  <tgroup cols="2">
@@ -1752,6 +1817,11 @@
 	      </row>
 
 	      <row>
+		<entry><varname>CPAN</varname></entry>
+		<entry><literal>${PORTNAME:C/-.*//}</literal></entry>
+	      </row>
+
+	      <row>
 		<entry><varname>DEBIAN</varname></entry>
 		<entry><literal>pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME}</literal></entry>
 	      </row>
@@ -1762,11 +1832,26 @@
 	      </row>
 
 	      <row>
+		<entry><varname>FESTIVAL</varname></entry>
+		<entry><literal>${PORTREVISION}</literal></entry>
+	      </row>
+
+	      <row>
 		<entry><varname>GCC</varname></entry>
 		<entry><literal>releases/${DISTNAME}</literal></entry>
 	      </row>
 
 	      <row>
+		<entry><varname>GENTOO</varname></entry>
+		<entry><literal>distfiles</literal></entry>
+	      </row>
+
+	      <row>
+		<entry><varname>GIMP</varname></entry>
+		<entry><literal>${PORTNAME}/${PORTVERSION:R}/</literal></entry>
+	      </row>
+
+	      <row>
 		<entry><varname>GH</varname></entry>
 		<entry><literal>${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/</literal></entry>
 	      </row>
@@ -1777,22 +1862,17 @@
 	      </row>
 
 	      <row>
-		<entry><varname>GHL</varname></entry>
-		<entry><literal>${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/</literal></entry>
-	      </row>
-
-	      <row>
 		<entry><varname>GNOME</varname></entry>
 		<entry><literal>sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}</literal></entry>
 	      </row>
 
 	      <row>
-		<entry><varname>GIMP</varname></entry>
-		<entry><literal>${PORTNAME}/${PORTVERSION:R}/</literal></entry>
+		<entry><varname>GNU</varname></entry>
+		<entry><literal>${PORTNAME}</literal></entry>
 	      </row>
 
 	      <row>
-		<entry><varname>GNU</varname></entry>
+		<entry><varname>GNUPG</varname></entry>
 		<entry><literal>${PORTNAME}</literal></entry>
 	      </row>
 
@@ -1827,8 +1907,13 @@
 	      </row>
 
 	      <row>
-		<entry><varname>CPAN</varname></entry>
-		<entry><literal>${PORTNAME:C/-.*//}</literal></entry>
+		<entry><varname>QT</varname></entry>
+		<entry><literal>archive/qt/${PORTVERSION:R}</literal></entry>
+	      </row>
+
+	      <row>
+		<entry><varname>SAMBA</varname></entry>
+		<entry><literal>${PORTNAME}</literal></entry>
 	      </row>
 
 	      <row>