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
@@ -1762,11 +1762,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>
@@ -1787,12 +1802,12 @@
 	      </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>
 
@@ -1832,6 +1847,16 @@
 	      </row>
 
 	      <row>
+		<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>
 		<entry><varname>SAVANNAH</varname></entry>
 		<entry><literal>${PORTNAME:tl}</literal></entry>
 	      </row>