Index: head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
+++ head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
@@ -461,21 +461,67 @@
 	<programlisting>@(,games,2755) sbin/daemon</programlisting>
       </sect3>
 
-      <sect3 xml:id="plist-keywords-base-cwd">
-	<title><literal>@cwd</literal>
-	  [<replaceable>directory</replaceable>] (Deprecated)</title>
-
-	<para>Set the internal directory pointer to point to
-	  directory.  All subsequent filenames are assumed relative to
-	  this directory.</para>
-      </sect3>
-
       <sect3 xml:id="plist-keywords-base-exec">
-	<title><literal>@exec</literal>
+	<title><literal>@preexec</literal>
+	  <replaceable>command</replaceable>,
+	  <literal>@postexec</literal>
+	  <replaceable>command</replaceable>,
+	  <literal>@preunexec</literal>
+	  <replaceable>command</replaceable>,
+	  <literal>@postunexec</literal>
 	  <replaceable>command</replaceable></title>
 
 	<para>Execute <replaceable>command</replaceable> as part of
-	  the unpacking process.  If command contains any of these
+	  the package installation or deinstallation process.</para>
+
+	<variablelist>
+	  <varlistentry>
+	    <term><literal>@preexec</literal>
+	      <replaceable>command</replaceable></term>
+
+	    <listitem>
+	      <para>Execute <replaceable>command</replaceable> as part
+		of the <filename>pre-install</filename>
+		scripts.</para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><literal>@postexec</literal>
+	      <replaceable>command</replaceable></term>
+
+	    <listitem>
+	      <para>Execute <replaceable>command</replaceable> as part
+		of the <filename>post-install</filename>
+		scripts.</para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><literal>@preunexec</literal>
+	      <replaceable>command</replaceable></term>
+
+	    <listitem>
+	      <para>Execute <replaceable>command</replaceable> as part
+		of the <filename>pre-deinstall</filename>
+		scripts.</para>
+	    </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><literal>@postunexec</literal>
+	      <replaceable>command</replaceable></term>
+
+	    <listitem>
+	      <para>Execute <replaceable>command</replaceable> as part
+		of the <filename>post-deinstall</filename>
+		scripts.</para>
+	    </listitem>
+	  </varlistentry>
+	</variablelist>
+
+	<para>If <replaceable>command</replaceable> contains
+	  any of these
 	  sequences somewhere in it, they are expanded
 	  inline.  For these examples, assume that
 	  <literal>@cwd</literal> is set to
@@ -527,20 +573,15 @@
 	</variablelist>
       </sect3>
 
-      <sect3 xml:id="plist-keywords-base-unexec">
-	<title><literal>@unexec</literal>
-	  <replaceable>command</replaceable></title>
+      <sect3 xml:id="plist-keywords-base-exec-deprecated">
+	<title><literal>@exec</literal>
+	  <replaceable>command</replaceable>,
+	  <literal>@unexec</literal>
+	  <replaceable>command</replaceable> (Deprecated)</title>
 
 	<para>Execute <replaceable>command</replaceable> as part of
-	  the deinstallation process.  Expansion of special
-	  <literal>%</literal> sequences is the same as for
-	  <literal>@exec</literal>.  This command is not executed
-	  during the package add, as <literal>@exec</literal> is, but
-	  rather when the package is deleted.  This is useful for
-	  deleting links and other ancillary files that were created
-	  as a result of adding the package, but not directly known to
-	  the package's table of contents (and hence not automatically
-	  removable).</para>
+	  the installation or deinstallation process.  Please use <xref
+	    linkend="plist-keywords-base-exec"/> instead.</para>
       </sect3>
 
       <sect3 xml:id="plist-keywords-base-mode">