Index: kde/add/kde-i18n.xml
===================================================================
--- kde/add/kde-i18n.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kde-i18n.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kde-i18n-[xx]-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -66,8 +70,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libxml2"/></para>
+    <para role="recommended"><xref linkend="libxml2"/></para>
 
   </sect2>
Index: kde/add/kdeaccessibility.xml
===================================================================
--- kde/add/kdeaccessibility.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdeaccessibility.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdeaccessibility-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,12 +59,12 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/> and
+    <para role="recommended"><xref linkend="libjpeg"/> and
     <xref linkend="libxml2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para>A text-to-speech synthesis program such as
+    <para role="optional">A text-to-speech synthesis program such as
     <xref linkend="freetts"/> or
     <ulink url="http://www.cstr.ed.ac.uk/projects/festival/">Festival</ulink>
Index: kde/add/kdeaddons.xml
===================================================================
--- kde/add/kdeaddons.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdeaddons.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdeaddons-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,12 +59,12 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/> and
+    <para role="recommended"><xref linkend="libjpeg"/> and
     <xref linkend="libxml2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="kdenetwork"/>,
+    <para role="optional"><xref linkend="kdenetwork"/>,
     <xref linkend="kdemultimedia"/>,
     <xref linkend="kdepim"/>,
Index: kde/add/kdeadmin.xml
===================================================================
--- kde/add/kdeadmin.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdeadmin.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdeadmin-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,11 +59,12 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/> and <xref linkend="libxml2"/></para>
+    <para role="recommended"><xref linkend="libjpeg"/> and
+    <xref linkend="libxml2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="linux-pam"/> and
+    <para role="optional"><xref linkend="linux-pam"/> and
     <ulink url="http://lilo.go.dyndns.org/">LILO</ulink></para>
 
Index: kde/add/kdeartwork.xml
===================================================================
--- kde/add/kdeartwork.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdeartwork.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdeartwork-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,13 +59,13 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/>,
+    <para role="recommended"><xref linkend="libjpeg"/>,
     <xref linkend="libxml2"/>, and
     <xref linkend="libart_lgpl"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="xscreensaver"/></para>
+    <para role="optional"><xref linkend="xscreensaver"/></para>
 
   </sect2>
Index: kde/add/kdebindings.xml
===================================================================
--- kde/add/kdebindings.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdebindings.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdebindings-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,13 +59,13 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/>,
+    <para role="recommended"><xref linkend="libjpeg"/>,
     <xref linkend="libxml2"/>, and
     <xref linkend="libxslt"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="GLib"/>,
+    <para role="optional"><xref linkend="GLib"/>,
     <xref linkend="GTK"/>,
     <xref linkend="python"/>,
Index: kde/add/kdeedu.xml
===================================================================
--- kde/add/kdeedu.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdeedu.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdeedu-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -62,12 +66,13 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/> and
+    <para role="recommended"><xref linkend="libjpeg"/> and
     <xref linkend="libxml2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><ulink url="http://www.boost.org/libs/python/doc/index.html">Boost.Python</ulink></para>
+    <para role="optional"><ulink
+    url="http://www.boost.org/libs/python/doc/index.html">Boost.Python</ulink></para>
 
   </sect2>
Index: kde/add/kdegames.xml
===================================================================
--- kde/add/kdegames.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdegames.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdegames-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,13 +59,13 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/> and
+    <para role="recommended"><xref linkend="libjpeg"/> and
     <xref linkend="libxml2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><ulink url="http://www.graphviz.org/">GraphViz</ulink> and
-    <xref linkend="doxygen"/></para>
+    <para role="optional"><ulink url="http://www.graphviz.org/">GraphViz</ulink>
+    and <xref linkend="doxygen"/></para>
 
   </sect2>
Index: kde/add/kdegraphics.xml
===================================================================
--- kde/add/kdegraphics.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdegraphics.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdegraphics-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,13 +59,13 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/>,
+    <para role="recommended"><xref linkend="libjpeg"/>,
     <xref linkend="libxml2"/>, and
     <xref linkend="libart_lgpl"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="libtiff"/>,
+    <para role="optional"><xref linkend="libtiff"/>,
     <xref linkend="imlib"/>,
     <xref linkend="lcms"/>,
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdemultimedia.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdemultimedia-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,8 +59,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/>,
+    <para role="recommended"><xref linkend="libjpeg"/>,
     <xref linkend="libxml2"/>,
     <xref linkend="alsa"/>, and
@@ -64,5 +68,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="cdparanoia"/>,
+    <para role="optional"><xref linkend="cdparanoia"/>,
     <xref linkend="lame"/>,
     <xref linkend="audiofile"/>,
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdenetwork.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdenetwork-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,8 +59,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/>,
+    <para role="recommended"><xref linkend="libjpeg"/>,
     <xref linkend="libxml2"/>,
     <xref linkend="libxslt"/>, and
@@ -64,5 +68,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="ppp"/>,
+    <para role="optional"><xref linkend="ppp"/>,
     <xref linkend="xmms"/>,
     <xref linkend="doxygen"/>,
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdepim.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -21,4 +21,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdepim-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -57,8 +61,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/>,
+    <para role="recommended"><xref linkend="libjpeg"/>,
     <xref linkend="libxml2"/>,
     <xref linkend="gnupg"/> and
@@ -66,5 +70,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="pilot-link"/>,
+    <para role="optional"><xref linkend="pilot-link"/>,
     <ulink url="&gnu-org;#gpgme">GPGME-0.9.x</ulink>
     (requires <ulink url="&gnu-org;#libgpg-error">Libgpg-error</ulink>
Index: kde/add/kdesdk.xml
===================================================================
--- kde/add/kdesdk.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdesdk.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdesdk-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,8 +59,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/>,
+    <para role="recommended"><xref linkend="libjpeg"/>,
     <xref linkend="libxml2"/>, and
     <xref linkend="db"/></para>
Index: kde/add/kdetoys.xml
===================================================================
--- kde/add/kdetoys.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdetoys.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdetoys-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,8 +59,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/> and
+    <para role="recommended"><xref linkend="libjpeg"/> and
     <xref linkend="libxml2"/></para>
 
Index: kde/add/kdeutils.xml
===================================================================
--- kde/add/kdeutils.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdeutils.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdeutils-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,13 +59,13 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/> and
+    <para role="recommended"><xref linkend="libjpeg"/> and
     <xref linkend="libxml2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><ulink url="http://www.net-snmp.org/">Net-SNMP</ulink> and
-    <ulink url="http://tpctl.sourceforge.net/">tpctl</ulink></para>
+    <para role="optional"><ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>
+    and <ulink url="http://tpctl.sourceforge.net/">tpctl</ulink></para>
 
   </sect2>
Index: kde/add/kdevelop.xml
===================================================================
--- kde/add/kdevelop.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdevelop.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdevelop-&kdevelop-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,11 +59,12 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/> and <xref linkend="libxml2"/></para>
+    <para role="recommended"><xref linkend="libjpeg"/> and
+    <xref linkend="libxml2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="python"/>,
+    <para role="optional"><xref linkend="python"/>,
     <ulink url="http://sourceforge.net/projects/docbase/">DocBase</ulink>,
     <ulink url="http://www.graphviz.org/">GraphViz</ulink>, and
Index: kde/add/kdewebdev.xml
===================================================================
--- kde/add/kdewebdev.xml	(revision bccbdaea21ec56127b72e066884d884818a18b7e)
+++ kde/add/kdewebdev.xml	(revision 91cb43ad56798315672408741ff4a55d17efdd3f)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">kdewebdev-&kde-version;.tar</keyword>
+      <keyword role="ftptdir">kde</keyword>
+    </keywordset>
   </sect1info>
 
@@ -55,8 +59,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="kdebase"/></para>
+    <para role="required"><xref linkend="kdebase"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/>,
+    <para role="recommended"><xref linkend="libjpeg"/>,
     <xref linkend="libxml2"/>, and
     <xref linkend="libxslt"/></para>
