Index: gnome/core/control-center.xml
===================================================================
--- gnome/core/control-center.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/control-center.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">control-center-&control-center-version;.tar</keyword>
+      <keyword role="ftptdir">control-center</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,5 +62,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libxklavier"/>,
+    <para role="required"><xref linkend="libxklavier"/>,
     <xref linkend="metacity"/>,
     <xref linkend="gnome-icon-theme"/> and
@@ -64,5 +68,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="evolution-data-server"/>,
+    <para role="optional"><xref linkend="evolution-data-server"/>,
     <xref linkend="alsa"/>,
     <xref linkend="gst-plugins"/> and
Index: gnome/core/eel.xml
===================================================================
--- gnome/core/eel.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/eel.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">eel-&eel-version;.tar</keyword>
+      <keyword role="ftptdir">eel</keyword>
+    </keywordset>
   </sect1info>
 
@@ -59,5 +63,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-desktop"/>,
+    <para role="required"><xref linkend="gnome-desktop"/>,
     <xref linkend="gnome-menus"/> and
     <xref linkend="gail"/></para>
Index: gnome/core/gail.xml
===================================================================
--- gnome/core/gail.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gail.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gail-&gail-version;.tar</keyword>
+      <keyword role="ftptdir">gail</keyword>
+    </keywordset>
   </sect1info>
 
@@ -59,8 +63,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomecanvas"/></para>
+    <para role="required"><xref linkend="libgnomecanvas"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="gtk-doc"/></para>
 
   </sect2>
Index: gnome/core/gconf.xml
===================================================================
--- gnome/core/gconf.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gconf.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">GConf-&GConf-version;.tar</keyword>
+      <keyword role="ftptdir">GConf</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,9 +62,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="ORBit2"/> and
+    <para role="required"><xref linkend="ORBit2"/> and
     <xref linkend="libxml2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk2"/>,
+    <para role="optional"><xref linkend="gtk2"/>,
     <xref linkend="openldap"/>,
     <xref linkend="gtk-doc"/> and
Index: gnome/core/gnome-applets.xml
===================================================================
--- gnome/core/gnome-applets.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome-applets.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-applets-&gnome-applets-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-applets</keyword>
+    </keywordset>
   </sect1info>
 
@@ -59,10 +63,10 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gail"/>,
+    <para role="required"><xref linkend="gail"/>,
     <xref linkend="gnome-panel"/> and
     <xref linkend="libxklavier"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="libgtop"/>,
+    <para role="optional"><xref linkend="libgtop"/>,
     <xref linkend="gst-plugins"/>,
     <xref linkend="hal"/>,
Index: gnome/core/gnome-backgrounds.xml
===================================================================
--- gnome/core/gnome-backgrounds.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome-backgrounds.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-backgrounds-&gnome-backgrounds-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-backgrounds</keyword>
+    </keywordset>
   </sect1info>
 
@@ -59,5 +63,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="intltool"/></para>
+    <para role="required"><xref linkend="intltool"/></para>
 
   </sect2>
Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome-desktop.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-desktop-&gnome-desktop-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-desktop</keyword>
+    </keywordset>
   </sect1info>
 
@@ -60,9 +64,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/> and
+    <para role="required"><xref linkend="libgnomeui"/> and
     <xref linkend="gnome-doc-utils"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="startup-notification"/></para>
+    <para role="recommended"><xref linkend="startup-notification"/></para>
 
   </sect2>
Index: gnome/core/gnome-doc-utils.xml
===================================================================
--- gnome/core/gnome-doc-utils.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome-doc-utils.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-doc-utils-&gnome-doc-utils-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-doc-utils</keyword>
+    </keywordset>
   </sect1info>
 
@@ -66,9 +70,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="python"/> and
+    <para role="required"><xref linkend="python"/> and
     <xref linkend="scrollkeeper"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="pkgconfig"/></para>
+    <para role="optional"><xref linkend="pkgconfig"/></para>
 
   </sect2>
Index: gnome/core/gnome-icon-theme.xml
===================================================================
--- gnome/core/gnome-icon-theme.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome-icon-theme.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-icon-theme-&gnome-icon-theme-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-icon-theme</keyword>
+    </keywordset>
   </sect1info>
 
@@ -59,9 +63,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="hicolor-icon-theme"/> and
+    <para role="required"><xref linkend="hicolor-icon-theme"/> and
     <xref linkend="perl-xml-parser"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="pkgconfig"/></para>
+    <para role="optional"><xref linkend="pkgconfig"/></para>
 
   </sect2>
Index: gnome/core/gnome-keyring.xml
===================================================================
--- gnome/core/gnome-keyring.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome-keyring.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-keyring-&gnome-keyring-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-keyring</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,5 +62,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gtk2"/></para>
+    <para role="required"><xref linkend="gtk2"/></para>
 
   </sect2>
Index: gnome/core/gnome-menus.xml
===================================================================
--- gnome/core/gnome-menus.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome-menus.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-menus-&gnome-menus-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-menus</keyword>
+    </keywordset>
   </sect1info>
 
@@ -63,9 +67,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="glib2"/> and
+    <para role="required"><xref linkend="glib2"/> and
     <xref linkend="intltool"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="python"/> and
+    <para role="optional"><xref linkend="python"/> and
     <xref linkend="gamin"/></para>
 
Index: gnome/core/gnome-mime-data.xml
===================================================================
--- gnome/core/gnome-mime-data.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome-mime-data.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-mime-data-&gnome-mime-data-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-mime-data</keyword>
+    </keywordset>
   </sect1info>
 
@@ -59,5 +63,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="perl-xml-parser"/></para>
+    <para role="required"><xref linkend="perl-xml-parser"/></para>
 
   </sect2>
Index: gnome/core/gnome-panel.xml
===================================================================
--- gnome/core/gnome-panel.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome-panel.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-panel-&gnome-panel-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-panel</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,11 +62,11 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-desktop"/>,
+    <para role="required"><xref linkend="gnome-desktop"/>,
     <xref linkend="libwnck"/> and
     <xref linkend="gnome-menus"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="evolution-data-server"/> (required if you plan on
-    installing <application>Evolution</application> or
+    <para role="optional"><xref linkend="evolution-data-server"/> (required if
+    you plan on installing <application>Evolution</application> or
     <application>GnomeMeeting</application>) and
     <xref linkend="gtk-doc"/></para>
Index: gnome/core/gnome-session.xml
===================================================================
--- gnome/core/gnome-session.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome-session.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-session-&gnome-session-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-session</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,8 +62,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/></para>
+    <para role="required"><xref linkend="libgnomeui"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="tcpwrappers"/></para>
+    <para role="optional"><xref linkend="tcpwrappers"/></para>
 
   </sect2>
Index: gnome/core/gnome-terminal.xml
===================================================================
--- gnome/core/gnome-terminal.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome-terminal.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-terminal-&gnome-terminal-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-terminal</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,5 +62,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/>,
+    <para role="required"><xref linkend="libgnomeui"/>,
     <xref linkend="scrollkeeper"/>,
     <xref linkend="vte"/> and
Index: gnome/core/gnome-themes.xml
===================================================================
--- gnome/core/gnome-themes.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome-themes.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-themes-&gnome-themes-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-themes</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,5 +62,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="intltool"/> and <xref linkend="gtk-engines"/></para>
+    <para role="required"><xref linkend="intltool"/> and
+    <xref linkend="gtk-engines"/></para>
 
   </sect2>
Index: gnome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome-vfs.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-vfs-&gnome-vfs-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-vfs</keyword>
+    </keywordset>
   </sect1info>
 
@@ -68,5 +72,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="intltool"/>,
+    <para role="required"><xref linkend="intltool"/>,
     <xref linkend="GConf"/>,
     <xref linkend="libbonobo"/>,
@@ -75,5 +79,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="samba3"/>,
+    <para role="optional"><xref linkend="samba3"/>,
     <xref linkend="cdparanoia"/>,
     <xref linkend="gamin"/>,
Index: gnome/core/gnome2-user-docs.xml
===================================================================
--- gnome/core/gnome2-user-docs.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gnome2-user-docs.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome2-user-docs-&gnome2-user-docs-version;.tar</keyword>
+      <keyword role="ftptdir">gnome2-user-docs</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,8 +62,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="scrollkeeper"/></para>
+    <para role="required"><xref linkend="scrollkeeper"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="docbook-utils"/></para>
+    <para role="optional"><xref linkend="docbook-utils"/></para>
 
   </sect2>
Index: gnome/core/gtk-engines.xml
===================================================================
--- gnome/core/gtk-engines.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/gtk-engines.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gtk-engines-&gtk-engines-version;.tar</keyword>
+      <keyword role="ftptdir">gtk-engines</keyword>
+    </keywordset>
   </sect1info>
 
@@ -59,5 +63,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gtk2"/></para>
+    <para role="required"><xref linkend="gtk2"/></para>
 
   </sect2>
Index: gnome/core/libbonobo.xml
===================================================================
--- gnome/core/libbonobo.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/libbonobo.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libbonobo-&libbonobo-version;.tar</keyword>
+      <keyword role="ftptdir">libbonobo</keyword>
+    </keywordset>
   </sect1info>
 
@@ -60,11 +64,11 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="ORBit2"/>,
+    <para role="required"><xref linkend="ORBit2"/>,
     <xref linkend="libxml2"/> and
     <xref linkend="perl-xml-parser"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>) and
-    <xref linkend="gtk-doc"/></para>
+    <para role="optional">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)
+    and <xref linkend="gtk-doc"/></para>
 
   </sect2>
Index: gnome/core/libbonoboui.xml
===================================================================
--- gnome/core/libbonoboui.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/libbonoboui.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libbonoboui-&libbonoboui-version;.tar</keyword>
+      <keyword role="ftptdir">libbonoboui</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,8 +62,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnome"/> and <xref linkend="libgnomecanvas"/></para>
+    <para role="required"><xref linkend="libgnome"/> and
+    <xref linkend="libgnomecanvas"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="gtk-doc"/></para>
 
   </sect2>
Index: gnome/core/libgnome.xml
===================================================================
--- gnome/core/libgnome.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/libgnome.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libgnome-&libgnome-version;.tar</keyword>
+      <keyword role="ftptdir">libgnome</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,8 +62,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-vfs"/> and <xref linkend="esound"/></para>
+    <para role="required"><xref linkend="gnome-vfs"/> and
+    <xref linkend="esound"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="gtk-doc"/></para>
 
   </sect2>
Index: gnome/core/libgnomecanvas.xml
===================================================================
--- gnome/core/libgnomecanvas.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/libgnomecanvas.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libgnomecanvas-&libgnomecanvas-version;.tar</keyword>
+      <keyword role="ftptdir">libgnomecanvas</keyword>
+    </keywordset>
   </sect1info>
 
@@ -60,9 +64,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libglade"/> and
+    <para role="required"><xref linkend="libglade"/> and
     <xref linkend="libart_lgpl"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="gtk-doc"/></para>
 
   </sect2>
Index: gnome/core/libgnomeui.xml
===================================================================
--- gnome/core/libgnomeui.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/libgnomeui.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libgnomeui-&libgnomeui-version;.tar</keyword>
+      <keyword role="ftptdir">libgnomeui</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,8 +62,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libbonoboui"/> and <xref linkend="gnome-keyring"/></para>
+    <para role="required"><xref linkend="libbonoboui"/> and
+    <xref linkend="gnome-keyring"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="libjpeg"/>
+    <para role="optional"><xref linkend="libjpeg"/>
     and <xref linkend="gtk-doc"/></para>
 
Index: gnome/core/libgtop.xml
===================================================================
--- gnome/core/libgtop.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/libgtop.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libgtop-&libgtop-version;.tar</keyword>
+      <keyword role="ftptdir">libgtop</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,8 +62,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="glib2"/></para>
+    <para role="required"><xref linkend="glib2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="popt"/>,
+    <para role="optional"><xref linkend="popt"/>,
     <xref linkend="gdbm"/> and
     X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
Index: gnome/core/nautilus.xml
===================================================================
--- gnome/core/nautilus.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/nautilus.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">nautilus-&nautilus-version;.tar</keyword>
+      <keyword role="ftptdir">nautilus</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,10 +62,10 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="eel"/>,
+    <para role="required"><xref linkend="eel"/>,
     <xref linkend="libexif"/> and
     <xref linkend="librsvg"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="startup-notification"/> and
+    <para role="optional"><xref linkend="startup-notification"/> and
     <xref linkend="docbook-utils"/></para>
 
Index: gnome/core/orbit2.xml
===================================================================
--- gnome/core/orbit2.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/orbit2.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">ORBit2-&ORBit2-version;.tar</keyword>
+      <keyword role="ftptdir">ORBit2</keyword>
+    </keywordset>
   </sect1info>
 
@@ -59,8 +63,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libidl"/> and <xref linkend="popt"/></para>
+    <para role="required"><xref linkend="libidl"/> and <xref linkend="popt"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/> and <xref linkend="openssl"/></para>
+    <para role="optional"><xref linkend="gtk-doc"/> and <xref linkend="openssl"/></para>
 
   </sect2>
Index: gnome/core/scrollkeeper.xml
===================================================================
--- gnome/core/scrollkeeper.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/scrollkeeper.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">scrollkeeper-&scrollkeeper-version;.tar</keyword>
+      <keyword role="ftptdir">scrollkeeper</keyword>
+    </keywordset>
   </sect1info>
 
@@ -60,5 +64,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="intltool"/>,
+    <para role="required"><xref linkend="intltool"/>,
     <xref linkend="libxslt"/> and
     <xref linkend="DocBook"/></para>
Index: gnome/core/vte.xml
===================================================================
--- gnome/core/vte.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/vte.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">vte-&vte-version;.tar</keyword>
+      <keyword role="ftptdir">vte</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,8 +62,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gtk2"/></para>
+    <para role="required"><xref linkend="gtk2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/> and
+    <para role="optional"><xref linkend="gtk-doc"/> and
     <ulink url="http://www.pygtk.org/">PyGTK</ulink></para>
 
Index: gnome/core/yelp.xml
===================================================================
--- gnome/core/yelp.xml	(revision c72d555140c3c8163a1baa4529c7ccf7ec909f08)
+++ gnome/core/yelp.xml	(revision b22e19bfa2d0f6aabb756a3a9703d5656c4d88bf)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">yelp-&yelp-version;.tar</keyword>
+      <keyword role="ftptdir">yelp</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,5 +62,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/>,
+    <para role="required"><xref linkend="libgnomeui"/>,
     <xref linkend="gnome-doc-utils"/> and
     a Gecko HTML rendering engine (<xref linkend="mozilla"/> or
