Index: general/genutils/bc.xml
===================================================================
--- general/genutils/bc.xml	(revision 4f26c5433587b01da272158b9e11b97fe0e801c4)
+++ general/genutils/bc.xml	(revision 52d50d5a58b48ec8744497acb079cf7cc2b9326a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">bc-&bc-version;.tar</keyword>
+      <keyword role="ftptdir">bc</keyword>
+    </keywordset>
   </sect1info>
 
@@ -70,5 +74,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><ulink url="http://sourceforge.net/projects/libedit/">libedit</ulink>
+    <para role="optional"><ulink url="http://sourceforge.net/projects/libedit/">libedit</ulink>
     (as an alternative to readline)</para>
 
Index: general/genutils/compface.xml
===================================================================
--- general/genutils/compface.xml	(revision 4f26c5433587b01da272158b9e11b97fe0e801c4)
+++ general/genutils/compface.xml	(revision 52d50d5a58b48ec8744497acb079cf7cc2b9326a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">compface-&compface-version;.tar</keyword>
+      <keyword role="ftptdir">compface</keyword>
+    </keywordset>
   </sect1info>
 
Index: general/genutils/desktop-file-utils.xml
===================================================================
--- general/genutils/desktop-file-utils.xml	(revision 4f26c5433587b01da272158b9e11b97fe0e801c4)
+++ general/genutils/desktop-file-utils.xml	(revision 52d50d5a58b48ec8744497acb079cf7cc2b9326a)
@@ -20,4 +20,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">desktop-file-utils-&desktop-file-utils-version;.tar</keyword>
+      <keyword role="ftptdir">desktop-file-utils</keyword>
+    </keywordset>
   </sect1info>
 
@@ -64,8 +68,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="glib2"/> and <xref linkend="popt"/></para>
+    <para role="required"><xref linkend="glib2"/> and <xref linkend="popt"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="emacs"/></para>
+    <para role="optional"><xref linkend="emacs"/></para>
 
   </sect2>
Index: general/genutils/gtk-doc.xml
===================================================================
--- general/genutils/gtk-doc.xml	(revision 4f26c5433587b01da272158b9e11b97fe0e801c4)
+++ general/genutils/gtk-doc.xml	(revision 52d50d5a58b48ec8744497acb079cf7cc2b9326a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gtk-doc-&gtk-doc-version;.tar</keyword>
+      <keyword role="ftptdir">gtk-doc</keyword>
+    </keywordset>
   </sect1info>
 
@@ -64,5 +68,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="openjade"/>,
+    <para role="required"><xref linkend="openjade"/>,
     <xref linkend="libxslt"/>,
     <xref linkend="DocBook"/> and
@@ -70,5 +74,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="sgml-dtd"/> and <xref linkend="docbook-dsssl"/></para>
+    <para role="optional"><xref linkend="sgml-dtd"/> and <xref linkend="docbook-dsssl"/></para>
 
   </sect2>
Index: general/genutils/hd2u.xml
===================================================================
--- general/genutils/hd2u.xml	(revision 4f26c5433587b01da272158b9e11b97fe0e801c4)
+++ general/genutils/hd2u.xml	(revision 52d50d5a58b48ec8744497acb079cf7cc2b9326a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">hd2u-&hd2u-version;.tar</keyword>
+      <keyword role="ftptdir">hd2u</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,5 +62,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="popt"/></para>
+    <para role="required"><xref linkend="popt"/></para>
 
   </sect2>
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 4f26c5433587b01da272158b9e11b97fe0e801c4)
+++ general/genutils/imagemagick.xml	(revision 52d50d5a58b48ec8744497acb079cf7cc2b9326a)
@@ -21,4 +21,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar</keyword>
+      <keyword role="ftptdir">ImageMagick</keyword>
+    </keywordset>
   </sect1info>
 
@@ -62,9 +66,9 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
+    <para role="recommended">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
 
     <bridgehead renderas="sect4">Optional (Install Based on the Required
     Format Support and Tools)</bridgehead>
-    <para><xref linkend="lcms"/>,
+    <para role="optional"><xref linkend="lcms"/>,
     <xref linkend="espgs"/> or <xref linkend="gs"/>,
     <xref linkend="libpng"/>,
Index: general/genutils/intltool.xml
===================================================================
--- general/genutils/intltool.xml	(revision 4f26c5433587b01da272158b9e11b97fe0e801c4)
+++ general/genutils/intltool.xml	(revision 52d50d5a58b48ec8744497acb079cf7cc2b9326a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">intltool-&intltool-version;.tar</keyword>
+      <keyword role="ftptdir">intltool</keyword>
+    </keywordset>
   </sect1info>
 
@@ -63,5 +67,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="perl-xml-parser"/></para>
+    <para role="required"><xref linkend="perl-xml-parser"/></para>
 
   </sect2>
Index: general/genutils/pilot-link.xml
===================================================================
--- general/genutils/pilot-link.xml	(revision 4f26c5433587b01da272158b9e11b97fe0e801c4)
+++ general/genutils/pilot-link.xml	(revision 52d50d5a58b48ec8744497acb079cf7cc2b9326a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">pilot-link-&pilot-link-version;.tar</keyword>
+      <keyword role="ftptdir">pilot-link</keyword>
+    </keywordset>
   </sect1info>
 
@@ -68,5 +72,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="libpng"/>,
+    <para role="optional"><xref linkend="libpng"/>,
     <xref linkend="jdk"/>,
     <xref linkend="tcl"/>,
Index: general/genutils/rep-gtk.xml
===================================================================
--- general/genutils/rep-gtk.xml	(revision 4f26c5433587b01da272158b9e11b97fe0e801c4)
+++ general/genutils/rep-gtk.xml	(revision 52d50d5a58b48ec8744497acb079cf7cc2b9326a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">rep-gtk-&rep-gtk-version;.tar</keyword>
+      <keyword role="ftptdir">rep-gtk</keyword>
+    </keywordset>
   </sect1info>
 
@@ -71,5 +75,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gtk2"/>,
+    <para role="required"><xref linkend="gtk2"/>,
     <xref linkend="libglade"/> and
     <xref linkend="librep"/></para>
Index: general/genutils/screen.xml
===================================================================
--- general/genutils/screen.xml	(revision 4f26c5433587b01da272158b9e11b97fe0e801c4)
+++ general/genutils/screen.xml	(revision 52d50d5a58b48ec8744497acb079cf7cc2b9326a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">screen-&screen-version;.tar</keyword>
+      <keyword role="ftptdir">screen</keyword>
+    </keywordset>
   </sect1info>
 
@@ -64,5 +68,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="linux-pam"/></para>
+    <para role="optional"><xref linkend="linux-pam"/></para>
 
   </sect2>
Index: general/genutils/tidy.xml
===================================================================
--- general/genutils/tidy.xml	(revision 4f26c5433587b01da272158b9e11b97fe0e801c4)
+++ general/genutils/tidy.xml	(revision 52d50d5a58b48ec8744497acb079cf7cc2b9326a)
@@ -24,4 +24,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">tidy_src_&tidy-version;.tar</keyword>
+      <keyword role="ftptdir">tidy</keyword>
+    </keywordset>
   </sect1info>
 
@@ -102,8 +106,8 @@
     <bridgehead renderas="sect4">Recommended (To Build the Man Page and Quick
     Reference Docs)</bridgehead>
-    <para><xref linkend="libxslt"/></para>
+    <para role="recommended"><xref linkend="libxslt"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
+    <para role="optional"><ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
 
   </sect2>
Index: general/genutils/unixodbc.xml
===================================================================
--- general/genutils/unixodbc.xml	(revision 4f26c5433587b01da272158b9e11b97fe0e801c4)
+++ general/genutils/unixodbc.xml	(revision 52d50d5a58b48ec8744497acb079cf7cc2b9326a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">unixODBC-&unixodbc-version;.tar</keyword>
+      <keyword role="ftptdir">unixODBC</keyword>
+    </keywordset>
   </sect1info>
 
@@ -66,5 +70,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="qt"/> (required to build the GUI tools),
+    <para role="optional"><xref linkend="qt"/> (required to build the GUI tools),
     <ulink url="http://www.gnu.org/software/pth/">GNU Pth</ulink> and
     <ulink url="http://www.hughes.com.au/products/msql/">Mini SQL</ulink></para>
Index: general/genutils/xscreensaver.xml
===================================================================
--- general/genutils/xscreensaver.xml	(revision 4f26c5433587b01da272158b9e11b97fe0e801c4)
+++ general/genutils/xscreensaver.xml	(revision 52d50d5a58b48ec8744497acb079cf7cc2b9326a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">xscreensaver-&xscreensaver-version;.tar</keyword>
+      <keyword role="ftptdir">xscreensaver</keyword>
+    </keywordset>
   </sect1info>
 
@@ -65,10 +69,10 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="bc"/> and
+    <para role="required"><xref linkend="bc"/> and
     <xref linkend="libglade"/> (alternatively
     <xref linkend="lesstif"/> but not recommended)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para> <xref linkend="libjpeg"/>,
+    <para role="optional"> <xref linkend="libjpeg"/>,
     <ulink url="http://linas.org/gle/">GLE</ulink>,
     <ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink>,
