Index: en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
@@ -313,7 +313,17 @@
 
     <programlisting>@sample(,games,660) etc/config.sample</programlisting>
 
-    <!-- Try and keep the keywords alphanumerically sorted -->
+    <!--
+    Keywords up-to-date with r381632.
+    Try and keep the keywords alphanumerically sorted.
+    -->
+
+    <sect2 xml:id="plist-keywords-desktop-file-utils">
+      <title><literal>@desktop-file-utils</literal></title>
+
+      <para>Will run <command>update-desktop-database -q</command>
+	after installation and deinstallation.</para>
+    </sect2>
 
     <sect2 xml:id="plist-keywords-fc">
       <title><literal>@fc</literal>
@@ -355,6 +365,13 @@
 	empty.</para>
     </sect2>
 
+    <sect2 xml:id="plist-keywords-glib-schemas">
+      <title><literal>@glib-schemas</literal></title>
+
+      <para>Runs <command>glib-compile-schemas</command> on
+	installation and deinstallation.</para>
+    </sect2>
+
     <sect2 xml:id="plist-keywords-info">
       <title><literal>@info</literal>
 	<replaceable>file</replaceable></title>
@@ -365,6 +382,23 @@
 	deinstallation.</para>
     </sect2>
 
+    <sect2 xml:id="plist-keywords-kld">
+      <title><literal>@kld</literal>
+	<replaceable>directory</replaceable></title>
+
+      <para>Runs <command>kldxref</command> on the directory
+	on installation and deinstallation.  Additionally, on
+	deinstallation, it will remove the directory if empty.</para>
+    </sect2>
+
+    <sect2 xml:id="plist-keywords-rmtry">
+      <title><literal>@rmtry</literal>
+	<replaceable>file</replaceable></title>
+
+      <para>Will remove the file on deinstallation, and not give an
+	error if the file is not there.</para>
+    </sect2>
+
     <sect2 xml:id="plist-keywords-sample">
       <title><literal>@sample</literal>
 	<replaceable>file</replaceable></title>
@@ -380,6 +414,14 @@
 	information.</para>
     </sect2>
 
+    <sect2 xml:id="plist-keywords-shared-mime-info">
+      <title><literal>@shared-mime-info</literal>
+	<replaceable>directory</replaceable></title>
+
+      <para>Runs <command>update-mime-database</command> on the
+	directory on installation and deinstallation.</para>
+    </sect2>
+
     <sect2 xml:id="plist-keywords-shell">
       <title><literal>@shell</literal>
 	<replaceable>file</replaceable></title>
Index: en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
@@ -8,7 +8,7 @@
 
 <!--
 
-  Document up-to date with r364718 revision of the ports tree.
+  Document up-to date with r381632 revision of the ports tree.
 
   This file documents the values of the USES make variable.  The
   format is easy to grasp from the already-added entries below (or use
@@ -47,13 +47,16 @@
 	<row xml:id="uses-ada">
 	  <entry><literal>ada</literal></entry>
 
-	  <entry>(none), <literal>47</literal></entry>
+	  <entry>(none), <literal>47</literal>, <literal>49</literal>,
+	    <literal>5</literal></entry>
 
 	  <entry>Depends on an <application>Ada</application>-capable
 	    compiler, and sets <varname>CC</varname> accordingly.
 	    Defaults to a <application>gcc</application> 4.9 based
 	    compiler, use <literal>:47</literal> to use the older
-	    <application>gcc</application> 4.7 based one.</entry>
+	    <application>gcc</application> 4.7 based one and
+	    <literal>:5</literal> to use the newer
+	    <application>gcc</application> 5 based one.</entry>
 	</row>
 
 	<row xml:id="uses-autoreconf">
@@ -80,6 +83,17 @@
 	    not run <command>autoreconf</command>.</entry>
 	</row>
 
+	<row xml:id="uses-blaslapack">
+	  <entry><literal>blaslapack</literal></entry>
+
+	  <entry>(none), <literal>atlas</literal>,
+	    <literal>netlib</literal> (default),
+	    <literal>gotoblas</literal>,
+	    <literal>openblas</literal></entry>
+
+	  <entry>Adds dependencies on Blas / Lapack libraries.</entry>
+	</row>
+
 	<row xml:id="uses-bison">
 	  <entry><literal>bison</literal></entry>
 
@@ -297,10 +311,9 @@
 	    <package role="port">devel/desktop-file-utils</package>.
 	    An extra post-install step will be run without interfering
 	    with any post-install steps already in the port
-	    <filename>Makefile</filename>.  Lines will be inserted
-	    into the plist to run
-	    <application>update-desktop-database</application> on
-	    package install or removal.</entry>
+	    <filename>Makefile</filename>.  A line with <link
+	      linkend="plist-keywords-desktop-file-utils"><literal>@desktop-file-utils</literal></link>
+	    will be added to the plist.</entry>
 	</row>
 
 	<row xml:id="uses-desthack">
@@ -388,6 +401,15 @@
 	    base system.</entry>
 	</row>
 
+	<row xml:id="uses-fakeroot">
+	  <entry><literal>fakeroot</literal></entry>
+
+	  <entry>(none)</entry>
+
+	  <entry>Changes some default behaviour of build systems to
+	    allow installing as a user.</entry>
+	</row>
+
 	<row xml:id="uses-fam">
 	  <entry><literal>fam</literal></entry>
 
@@ -409,6 +431,21 @@
 	    build-time dependency.</entry>
 	</row>
 
+	<row xml:id="uses-fonts">
+	  <entry><literal>fonts</literal></entry>
+
+	  <entry>(none)</entry>
+
+	  <entry>Adds a runtime dependency on tools needed to register
+	    fonts, and add an <literal><link
+		linkend="plist-keywords-fcfontsdir">@fcfontsdir</link>
+	      ${FONTSDIR}</literal> entry to the plist.
+	    <varname>FONTSDIR</varname> defaults to
+	    <filename>${PREFIX}/lib/X11/fonts/${FONTNAME}</filename>
+	    and <varname>FONTNAME</varname> to
+	    <literal>${PORTNAME}</literal>.</entry>
+	</row>
+
 	<row xml:id="uses-fortran">
 	  <entry><literal>fortran</literal></entry>
 
@@ -454,16 +491,43 @@
 	<row xml:id="uses-gettext">
 	  <entry><literal>gettext</literal></entry>
 
+	  <entry>(none)</entry>
+
+	  <entry>Deprecated.  Will include both <link
+	      linkend="uses-gettext-runtime"><literal>gettext-runtime</literal></link>
+	    and <link
+	      linkend="uses-gettext-tools"><literal>gettext-tools</literal></link>.</entry>
+	</row>
+
+	<row xml:id="uses-gettext-runtime">
+	  <entry><literal>gettext-runtime</literal></entry>
+
 	  <entry>(none), <literal>lib</literal> (default),
 	    <literal>build</literal>, <literal>run</literal></entry>
 
-	  <entry>Uses <package role="port">devel/gettext</package>.
-	    By default, with no arguments or with the
+	  <entry>Uses <package
+	      role="port">devel/gettext-runtime</package>.  By
+	    default, with no arguments or with the
 	    <literal>lib</literal> argument, implies a library
 	    dependency on <filename>libintl.so</filename>.
 	    <literal>build</literal> and <literal>run</literal>
 	    implies, respectively a build-time and a run-time
-	    dependency on <filename>xgettext</filename>.</entry>
+	    dependency on <filename>gettext</filename>.</entry>
+	</row>
+
+	<row xml:id="uses-gettext-tools">
+	  <entry><literal>gettext-tools</literal></entry>
+
+	  <entry>(none), <literal>build</literal> (default),
+	    <literal>run</literal></entry>
+
+	  <entry>Uses <package
+	      role="port">devel/gettext-tools</package>.  By default,
+	    with no argument, or with the <literal>build</literal>
+	    argument, a build time dependency on
+	    <filename>msgfmt</filename> is registered.  With the
+	    <literal>run</literal> argument, a run-time dependency is
+	    registered.</entry>
 	</row>
 
 	<row xml:id="uses-gmake">
@@ -682,7 +746,8 @@
 
 	      <listitem>
 		<para>Handle cross-referencing kernel modules upon
-		  installation and deinstallation.</para>
+		  installation and deinstallation, using <link
+		    linkend="plist-keywords-kld"><literal>@kld</literal></link>.</para>
 	      </listitem>
 	    </itemizedlist></entry>
 	</row>
@@ -891,12 +956,8 @@
 		  <filename>Makefile.PL</filename>,
 		  <filename>Build.PL</filename>, or the
 		  Module::Build::Tiny flavor of
-		  <filename>Build.PL</filename> is required.  If there
-		  is a <filename>.packlist</filename> referencing
-		  <varname>${STAGEDIR}</varname>, then
-		  <literal>fixpacklist</literal> must be used to
-		  patch it.  It defaults to
-		  <literal>build run</literal>.</para>
+		  <filename>Build.PL</filename> is required.  It
+		  defaults to <literal>build run</literal>.</para>
 	      </listitem>
 	    </itemizedlist></entry>
 	</row>
@@ -1026,10 +1087,9 @@
 	    from <package role="port">misc/shared-mime-info</package>.
 	    This uses will automatically add a post-install step in
 	    such a way that the port itself still can specify there
-	    own post-install step if needed.  It also insert lines
-	    into the plist for package install and removal to run
-	    <application>update-mime-data</application> with the
-	    correct arguments.</entry>
+	    own post-install step if needed.  It also add an <link
+	      linkend="plist-keywords-shared-mime-info"><literal>@shared-mime-info</literal></link>
+	    entry to the plist.</entry>
 	</row>
 
 	<row xml:id="uses-shebangfix">
@@ -1044,6 +1104,7 @@
 	    in scripts listed in <varname>SHEBANG_FILES</varname>.
 	    Currently <application>Bash</application>,
 	    <application>Java</application>,
+	    <application>Ksh</application>,
 	    <application>Perl</application>,
 	    <application>PHP</application>,
 	    <application>Python</application>,
@@ -1298,6 +1359,16 @@
 	    </itemizedlist></entry>
 	</row>
 
+	<row xml:id="uses-xfce">
+	  <entry><literal>xfce</literal></entry>
+
+	  <entry>(none), <literal>gtk3</literal></entry>
+
+	  <entry>Provide support for <application>Xfce</application>
+	    related ports.  See <xref linkend="using-xfce"/> for
+	    details.</entry>
+	</row>
+
 	<row xml:id="uses-zip">
 	  <entry><literal>zip</literal></entry>