Index: basicnet/mailnews/fetchmail.xml
===================================================================
--- basicnet/mailnews/fetchmail.xml	(revision 0034f4f5eaaa65329774aeb137b7ed372f0773de)
+++ basicnet/mailnews/fetchmail.xml	(revision 7e7cb4a7db5fe57b676986c34564290708aa6b8f)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">fetchmail-&fetchmail-version;.tar</keyword>
-      <keyword role="ftptdir">fetchmail</keyword>
-    </keywordset>
   </sect1info>
 
@@ -64,9 +60,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="openssl"/> and a local MDA
-    (<xref linkend="procmail"/>)</para>
+    <para><xref linkend="openssl"/> and a local MDA (<xref linkend="procmail"/>)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/> and <xref linkend="tk"/></para>
+    <para><xref linkend="python"/> and <xref linkend="tk"/></para>
 
   </sect2>
Index: basicnet/mailnews/mutt.xml
===================================================================
--- basicnet/mailnews/mutt.xml	(revision 0034f4f5eaaa65329774aeb137b7ed372f0773de)
+++ basicnet/mailnews/mutt.xml	(revision 7e7cb4a7db5fe57b676986c34564290708aa6b8f)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">mutt-&mutt-version;.tar</keyword>
-      <keyword role="ftptdir">mutt</keyword>
-    </keywordset>
   </sect1info>
 
@@ -58,5 +54,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gnupg"/>,
+    <para><xref linkend="gnupg"/>,
       <xref linkend="ispell"/>,
       <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
Index: basicnet/mailnews/nail.xml
===================================================================
--- basicnet/mailnews/nail.xml	(revision 0034f4f5eaaa65329774aeb137b7ed372f0773de)
+++ basicnet/mailnews/nail.xml	(revision 7e7cb4a7db5fe57b676986c34564290708aa6b8f)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">nail-&nail-version;.tar</keyword>
-      <keyword role="ftptdir">nail</keyword>
-    </keywordset>
   </sect1info>
 
@@ -66,5 +62,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/> or Mozilla NSS (from
+    <para><xref linkend="openssl"/> or Mozilla NSS (from
     <xref linkend="mozilla"/> or
     <xref linkend="firefox"/> or
Index: basicnet/mailnews/pine.xml
===================================================================
--- basicnet/mailnews/pine.xml	(revision 0034f4f5eaaa65329774aeb137b7ed372f0773de)
+++ basicnet/mailnews/pine.xml	(revision 7e7cb4a7db5fe57b676986c34564290708aa6b8f)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">pine&pine-version;.tar</keyword>
-      <keyword role="ftptdir">pine</keyword>
-    </keywordset>
   </sect1info>
 
@@ -72,8 +68,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="openssl"/></para>
+    <para><xref linkend="openssl"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openldap"/> and <xref linkend="mitkrb"/></para>
+    <para><xref linkend="openldap"/> and <xref linkend="mitkrb"/></para>
 
   </sect2>
Index: basicnet/mailnews/procmail.xml
===================================================================
--- basicnet/mailnews/procmail.xml	(revision 0034f4f5eaaa65329774aeb137b7ed372f0773de)
+++ basicnet/mailnews/procmail.xml	(revision 7e7cb4a7db5fe57b676986c34564290708aa6b8f)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">procmail-&procmail-version;.tar</keyword>
-      <keyword role="ftptdir">procmail</keyword>
-    </keywordset>
   </sect1info>
 
Index: basicnet/mailnews/slrn.xml
===================================================================
--- basicnet/mailnews/slrn.xml	(revision 0034f4f5eaaa65329774aeb137b7ed372f0773de)
+++ basicnet/mailnews/slrn.xml	(revision 7e7cb4a7db5fe57b676986c34564290708aa6b8f)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">slrn-&slrn-version;.tar</keyword>
-      <keyword role="ftptdir">slrn</keyword>
-    </keywordset>
   </sect1info>
 
@@ -64,9 +60,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="slang"/> and a
+    <para><xref linkend="slang"/> and a
     MTA (See <xref linkend="server-mail"/>)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/>,
+    <para><xref linkend="openssl"/>,
     <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>,
     <ulink url="http://www.fpx.de/fp/Software/UUDeview/">UUDeview</ulink>,
Index: basicnet/netlibs/curl.xml
===================================================================
--- basicnet/netlibs/curl.xml	(revision 0034f4f5eaaa65329774aeb137b7ed372f0773de)
+++ basicnet/netlibs/curl.xml	(revision 7e7cb4a7db5fe57b676986c34564290708aa6b8f)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">curl-&curl-version;.tar</keyword>
-      <keyword role="ftptdir">curl</keyword>
-    </keywordset>
   </sect1info>
 
@@ -65,5 +61,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="pkgconfig"/>,
+    <para><xref linkend="pkgconfig"/>,
     <xref linkend="openssl"/> or
     <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>,
@@ -76,5 +72,5 @@
 
     <bridgehead renderas="sect4">Optional (for Running the Test Suite)</bridgehead>
-    <para role="optional"><xref linkend="stunnel"/> (for running HTTPS and FTPS tests) and
+    <para><xref linkend="stunnel"/> (for running HTTPS and FTPS tests) and
     <ulink url="http://valgrind.kde.org/">Valgrind</ulink> (not used if building
     the shared library)</para>
Index: basicnet/netlibs/gnet.xml
===================================================================
--- basicnet/netlibs/gnet.xml	(revision 0034f4f5eaaa65329774aeb137b7ed372f0773de)
+++ basicnet/netlibs/gnet.xml	(revision 7e7cb4a7db5fe57b676986c34564290708aa6b8f)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnet-&gnet-version;.tar</keyword>
-      <keyword role="ftptdir">gnet</keyword>
-    </keywordset>
   </sect1info>
 
@@ -63,5 +59,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GLib"/> or <xref linkend="glib2"/></para>
+    <para><xref linkend="GLib"/> or <xref linkend="glib2"/></para>
 
   </sect2>
Index: template/template.xml
===================================================================
--- template/template.xml	(revision 0034f4f5eaaa65329774aeb137b7ed372f0773de)
+++ template/template.xml	(revision 7e7cb4a7db5fe57b676986c34564290708aa6b8f)
@@ -24,11 +24,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <!-- The actual package name but without .bz2 or .gz extension -->
-      <keyword role="package">TEMPLATE-&TEMPLATE-version;.tar</keyword>
-      <!-- The subdir under BLFS/conglomeration/ in where the package
-      is stored on the FTP mirrors -->
-      <keyword role="ftptdir">TEMPLATE</keyword>
-    </keywordset>
   </sect1info>
 
@@ -90,14 +83,14 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="BLFS DEPENDENCY"/></para>
+    <para><xref linkend="BLFS DEPENDENCY"/></para>
 
     <!-- As required -->
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink>,
+    <para><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink>,
     <xref linkend="BLFS DEPENDENCY"/></para>
 
     <!-- As required -->
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para>
+    <para><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para>
 
   </sect2>
