Index: postlfs/security/cracklib.xml
===================================================================
--- postlfs/security/cracklib.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ postlfs/security/cracklib.xml	(revision e19ad480b7cc5de61b7b9f7d05acb4e664a747e9)
@@ -22,4 +22,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">cracklib-&cracklib-version;.tar</keyword>
+      <keyword role="ftptdir">cracklib</keyword>
+    </keywordset>
   </sect1info>
 
@@ -101,5 +105,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="python"/></para>
+    <para role="optional"><xref linkend="python"/></para>
 
   </sect2>
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ postlfs/security/cyrus-sasl.xml	(revision e19ad480b7cc5de61b7b9f7d05acb4e664a747e9)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">cyrus-sasl-&cyrus-sasl-version;.tar</keyword>
+      <keyword role="ftptdir">cyrus-sasl</keyword>
+    </keywordset>
   </sect1info>
 
@@ -71,8 +75,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="openssl"/></para>
+    <para role="required"><xref linkend="openssl"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="linux-pam"/>,
+    <para role="optional"><xref linkend="linux-pam"/>,
     <xref linkend="openldap"/>,
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
Index: postlfs/security/gnupg.xml
===================================================================
--- postlfs/security/gnupg.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ postlfs/security/gnupg.xml	(revision e19ad480b7cc5de61b7b9f7d05acb4e664a747e9)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnupg-&gnupg-version;.tar</keyword>
+      <keyword role="ftptdir">gnupg</keyword>
+    </keywordset>
   </sect1info>
 
@@ -70,5 +74,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="openssl"/>,
+    <para role="optional"><xref linkend="openssl"/>,
     <xref linkend="openldap"/>,
     <xref linkend="libusb"/>,
Index: postlfs/security/heimdal.xml
===================================================================
--- postlfs/security/heimdal.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ postlfs/security/heimdal.xml	(revision e19ad480b7cc5de61b7b9f7d05acb4e664a747e9)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">heimdal-&heimdal-version;.tar</keyword>
+      <keyword role="ftptdir">heimdal</keyword>
+    </keywordset>
   </sect1info>
 
@@ -79,11 +83,11 @@
 
     <bridgehead renderas="sect4">Required to Build the Server-Side Tools</bridgehead>
-    <para><xref linkend="db"/> (recommended) or <xref linkend="gdbm"/></para>
+    <para role="required"><xref linkend="db"/> (recommended) or <xref linkend="gdbm"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="openssl"/></para>
+    <para role="recommended"><xref linkend="openssl"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="linux-pam"/>,
+    <para role="optional"><xref linkend="linux-pam"/>,
     <xref linkend="openldap"/>,
     X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>),
Index: postlfs/security/iptables.xml
===================================================================
--- postlfs/security/iptables.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ postlfs/security/iptables.xml	(revision e19ad480b7cc5de61b7b9f7d05acb4e664a747e9)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">iptables-&iptables-version;.tar</keyword>
+      <keyword role="ftptdir">iptables</keyword>
+    </keywordset>
   </sect1info>
 
Index: postlfs/security/linux-pam.xml
===================================================================
--- postlfs/security/linux-pam.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ postlfs/security/linux-pam.xml	(revision e19ad480b7cc5de61b7b9f7d05acb4e664a747e9)
@@ -20,4 +20,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">Linux-PAM-&linux-pam-version;.tar</keyword>
+      <keyword role="ftptdir">Linux-PAM</keyword>
+    </keywordset>
   </sect1info>
 
@@ -69,8 +73,8 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="cracklib"/></para>
+    <para role="recommended"><xref linkend="cracklib"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="db"/> (for the pam_userdb module),
+    <para role="optional"><xref linkend="db"/> (for the pam_userdb module),
     <ulink url="http://www.prelude-ids.org/">Prelude</ulink> and
     <ulink
Index: postlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ postlfs/security/mitkrb.xml	(revision e19ad480b7cc5de61b7b9f7d05acb4e664a747e9)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">krb5-&mitkrb-version;-signed.tar</keyword>
+      <keyword role="ftptdir">krb5</keyword>
+    </keywordset>
   </sect1info>
 
@@ -62,5 +66,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="xinetd"/> (services servers only),
+    <para role="optional"><xref linkend="xinetd"/> (services servers only),
     <xref linkend="linux-pam"/> (for <command>xdm</command> based logins) and
     <xref linkend="openldap"/> (alternative for <command>krb5kdc</command>
Index: postlfs/security/openssl.xml
===================================================================
--- postlfs/security/openssl.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ postlfs/security/openssl.xml	(revision e19ad480b7cc5de61b7b9f7d05acb4e664a747e9)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">openssl-&openssl-version;.tar</keyword>
+      <keyword role="ftptdir">openssl</keyword>
+    </keywordset>
   </sect1info>
 
@@ -69,5 +73,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="bc"/> (recommended
+    <para role="optional"><xref linkend="bc"/> (recommended
     if you run the test suite during the build)</para>
 
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ postlfs/security/shadow.xml	(revision e19ad480b7cc5de61b7b9f7d05acb4e664a747e9)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">shadow-&shadow-version;.tar</keyword>
+      <keyword role="ftptdir">shadow</keyword>
+    </keywordset>
   </sect1info>
 
@@ -70,5 +74,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="linux-pam"/></para>
+    <para role="required"><xref linkend="linux-pam"/></para>
 
   </sect2>
Index: postlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ postlfs/security/stunnel.xml	(revision e19ad480b7cc5de61b7b9f7d05acb4e664a747e9)
@@ -20,4 +20,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">stunnel-&stunnel-version;.tar</keyword>
+      <keyword role="ftptdir">stunnel</keyword>
+    </keywordset>
   </sect1info>
 
@@ -73,8 +77,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="openssl"/></para>
+    <para role="required"><xref linkend="openssl"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="tcpwrappers"/></para>
+    <para role="optional"><xref linkend="tcpwrappers"/></para>
 
   </sect2>
Index: postlfs/security/sudo.xml
===================================================================
--- postlfs/security/sudo.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ postlfs/security/sudo.xml	(revision e19ad480b7cc5de61b7b9f7d05acb4e664a747e9)
@@ -17,6 +17,10 @@
 
   <sect1info>
-    <othername>$LastChangedBy: $</othername>
-    <date>$Date: $</date>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">sudo-&sudo-version;.tar</keyword>
+      <keyword role="ftptdir">sudo</keyword>
+    </keywordset>
   </sect1info>
 
Index: postlfs/security/tripwire.xml
===================================================================
--- postlfs/security/tripwire.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ postlfs/security/tripwire.xml	(revision e19ad480b7cc5de61b7b9f7d05acb4e664a747e9)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">tripwire-&tripwire-version;.tar</keyword>
+      <keyword role="ftptdir">tripwire</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,5 +62,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para>MTA (See <xref linkend="server-mail"/>)</para>
+    <para role="optional">MTA (See <xref linkend="server-mail"/>)</para>
 
   </sect2>
