Index: gnome/otherlibs/bonobo14.xml
===================================================================
--- gnome/otherlibs/bonobo14.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/bonobo14.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">bonobo-&bonobo14-version;.tar</keyword>
+      <keyword role="ftptdir">bonobo</keyword>
+    </keywordset>
   </sect1info>
 
@@ -59,8 +63,10 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="oaf"/> and <xref linkend="gnome-print"/></para>
+    <para role="required"><xref linkend="oaf"/> and
+    <xref linkend="gnome-print"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/> and <xref linkend="docbook-utils"/></para>
+    <para role="optional"><xref linkend="gtk-doc"/> and
+    <xref linkend="docbook-utils"/></para>
 
   </sect2>
Index: gnome/otherlibs/gal1.xml
===================================================================
--- gnome/otherlibs/gal1.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/gal1.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gal-&gal1-version;.tar</keyword>
+      <keyword role="ftptdir">gal</keyword>
+    </keywordset>
   </sect1info>
 
@@ -60,9 +64,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-print"/> and
+    <para role="required"><xref linkend="gnome-print"/> and
     <xref linkend="libglade14"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gnome-vfs1"/> and
+    <para role="optional"><xref linkend="gnome-vfs1"/> and
     <xref linkend="gtk-doc"/></para>
 
Index: gnome/otherlibs/gconf1.xml
===================================================================
--- gnome/otherlibs/gconf1.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/gconf1.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -14,9 +14,13 @@
 
 <sect1 id="GConf1" xreflabel="GConf-&GConf1-version;">
-  <?dbhtml filename="gconf1.html"?>
+  <?dbhtml filename="GConf1.html"?>
 
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">GConf-&GConf1-version;.tar</keyword>
+      <keyword role="ftptdir">GConf</keyword>
+    </keywordset>
   </sect1info>
 
@@ -70,8 +74,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="oaf"/> and <xref linkend="popt"/></para>
+    <para role="required"><xref linkend="oaf"/> and <xref linkend="popt"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="GTK"/>,
+    <para role="optional"><xref linkend="GTK"/>,
     <xref linkend="db"/>,
     <xref linkend="guile"/> and
Index: gnome/otherlibs/gdk.xml
===================================================================
--- gnome/otherlibs/gdk.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/gdk.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -14,9 +14,13 @@
 
 <sect1 id="gdk" xreflabel="GDK Pixel Buffer-&gdk-version;">
-  <?dbhtml filename="gdkpixbuf.html"?>
+  <?dbhtml filename="gdk.html"?>
 
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gdk-pixbuf-&gdk-version;.tar</keyword>
+      <keyword role="ftptdir">gdk-pixbuf</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,8 +62,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="GTK"/></para>
+    <para role="required"><xref linkend="GTK"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gnome-libs"/>,
+    <para role="optional"><xref linkend="gnome-libs"/>,
     <xref linkend="gtk-doc"/> and
     <xref linkend="docbook-utils"/></para>
Index: gnome/otherlibs/gnome-libs.xml
===================================================================
--- gnome/otherlibs/gnome-libs.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/gnome-libs.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-libs-&gnome-libs-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-libs</keyword>
+    </keywordset>
   </sect1info>
 
@@ -68,5 +72,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="ORBit"/>,
+    <para role="required"><xref linkend="ORBit"/>,
     <xref linkend="GTK"/>,
     <xref linkend="imlib"/> and
@@ -74,5 +78,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="audiofile"/>,
+    <para role="optional"><xref linkend="audiofile"/>,
     <xref linkend="esound"/> and
     <xref linkend="gtk-doc"/></para>
Index: gnome/otherlibs/gnome-print.xml
===================================================================
--- gnome/otherlibs/gnome-print.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/gnome-print.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-print-&gnome-print-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-print</keyword>
+    </keywordset>
   </sect1info>
 
@@ -67,5 +71,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gdk"/>,
+    <para role="required"><xref linkend="gdk"/>,
     <xref linkend="gnome-libs"/> and
     <xref linkend="libxml"/></para>
Index: gnome/otherlibs/gnome-vfs1.xml
===================================================================
--- gnome/otherlibs/gnome-vfs1.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/gnome-vfs1.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-vfs-&gnome-vfs1-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-vfs</keyword>
+    </keywordset>
   </sect1info>
 
@@ -66,9 +70,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-mime-data"/> and
+    <para role="required"><xref linkend="gnome-mime-data"/> and
     <xref linkend="gnome-libs"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="pkgconfig"/>,
+    <para role="optional"><xref linkend="pkgconfig"/>,
     <xref linkend="oaf"/>,
     <xref linkend="libxml"/>,
Index: gnome/otherlibs/gtkhtml1.xml
===================================================================
--- gnome/otherlibs/gtkhtml1.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/gtkhtml1.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gtkhtml-&gtkhtml1-version;.tar</keyword>
+      <keyword role="ftptdir">gtkhtml</keyword>
+    </keywordset>
   </sect1info>
 
@@ -66,8 +70,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gal1"/> and <xref linkend="libcapplet"/></para>
+    <para role="required"><xref linkend="gal1"/> and
+    <xref linkend="libcapplet"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="GConf1"/>,
+    <para role="optional"><xref linkend="GConf1"/>,
     <xref linkend="soup"/>,
     <xref linkend="bonobo14"/>,
Index: gnome/otherlibs/guppi.xml
===================================================================
--- gnome/otherlibs/guppi.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/guppi.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">Guppi-&guppi-version;.tar</keyword>
+      <keyword role="ftptdir">Guppi</keyword>
+    </keywordset>
   </sect1info>
 
@@ -75,9 +79,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-print"/> and
+    <para role="required"><xref linkend="gnome-print"/> and
     <xref linkend="libglade14"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="bonobo14"/>,
+    <para role="optional"><xref linkend="bonobo14"/>,
     <xref linkend="gtk-doc"/> and
     <xref linkend="docbook-utils"/></para>
Index: gnome/otherlibs/libcapplet.xml
===================================================================
--- gnome/otherlibs/libcapplet.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/libcapplet.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libcapplet-&libcapplet-version;.tar</keyword>
+      <keyword role="ftptdir">libcapplet</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,8 +62,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-libs"/></para>
+    <para role="required"><xref linkend="gnome-libs"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="pkgconfig"/></para>
+    <para role="optional"><xref linkend="pkgconfig"/></para>
 
   </sect2>
Index: gnome/otherlibs/libghttp.xml
===================================================================
--- gnome/otherlibs/libghttp.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/libghttp.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libghttp-&libghttp-version;.tar</keyword>
+      <keyword role="ftptdir">libghttp</keyword>
+    </keywordset>
   </sect1info>
 
Index: gnome/otherlibs/libglade14.xml
===================================================================
--- gnome/otherlibs/libglade14.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/libglade14.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libglade-&libglade14-version;.tar</keyword>
+      <keyword role="ftptdir">libglade</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,8 +62,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libxml"/> and <xref linkend="GTK"/></para>
+    <para role="required"><xref linkend="libxml"/> and <xref linkend="GTK"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gnome-libs"/>,
+    <para role="optional"><xref linkend="gnome-libs"/>,
     <xref linkend="bonobo14"/>,
     <xref linkend="python"/> (to run the <command>libglade-xgettext</command>
Index: gnome/otherlibs/oaf.xml
===================================================================
--- gnome/otherlibs/oaf.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/oaf.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">oaf-&oaf-version;.tar</keyword>
+      <keyword role="ftptdir">oaf</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,10 +62,10 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="ORBit"/>,
+    <para role="required"><xref linkend="ORBit"/>,
     <xref linkend="libxml"/> and
     <xref linkend="popt"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="gtk-doc"/></para>
 
   </sect2>
Index: gnome/otherlibs/orbit.xml
===================================================================
--- gnome/otherlibs/orbit.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/orbit.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">ORBit-&ORBit-version;.tar</keyword>
+      <keyword role="ftptdir">ORBit</keyword>
+    </keywordset>
   </sect1info>
 
@@ -59,8 +63,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="GLib"/></para>
+    <para role="required"><xref linkend="GLib"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="tcpwrappers"/></para>
+    <para role="optional"><xref linkend="tcpwrappers"/></para>
 
   </sect2>
Index: gnome/otherlibs/soup.xml
===================================================================
--- gnome/otherlibs/soup.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
+++ gnome/otherlibs/soup.xml	(revision f4341f863542bf66775f2e5192eaa5e9b363266a)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">soup-&soup-version;.tar</keyword>
+      <keyword role="ftptdir">soup</keyword>
+    </keywordset>
   </sect1info>
 
@@ -70,10 +74,10 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="GLib"/> or <xref linkend="glib2"/>,
+    <para role="required"><xref linkend="GLib"/> or <xref linkend="glib2"/>,
     <xref linkend="libxml"/> or <xref linkend="libxml2"/> and
     <xref linkend="popt"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="apache"/>,
+    <para role="optional"><xref linkend="apache"/>,
     <xref linkend="openssl"/> or
     <xref linkend="mozilla"/> (for the NSS libraries),
