diff --git a/gnome/add/at-spi.xml b/gnome/add/at-spi.xml
index 83ff46f54c..1d68d0d9ab 100644
--- a/gnome/add/at-spi.xml
+++ b/gnome/add/at-spi.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">at-spi-&at-spi-version;.tar</keyword>
+      <keyword role="ftptdir">at-spi</keyword>
+    </keywordset>
   </sect1info>
 
   <title>AT SPI-&at-spi-version;</title>
@@ -59,10 +63,10 @@
     <bridgehead renderas="sect3">AT SPI Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gail"/> and <xref linkend="libbonobo"/></para>
+    <para role="required"><xref linkend="gail"/> and <xref linkend="libbonobo"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="gtk-doc"/></para>
 
   </sect2>
 
diff --git a/gnome/add/bug-buddy.xml b/gnome/add/bug-buddy.xml
index fcfe0e4add..1d6230c383 100644
--- a/gnome/add/bug-buddy.xml
+++ b/gnome/add/bug-buddy.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">bug-buddy-&bug-buddy-version;.tar</keyword>
+      <keyword role="ftptdir">bug-buddy</keyword>
+    </keywordset>
   </sect1info>
 
   <title>bug-buddy-&bug-buddy-version;</title>
@@ -58,7 +62,7 @@
     <bridgehead renderas="sect3">bug-buddy Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-desktop"/> and
+    <para role="required"><xref linkend="gnome-desktop"/> and
     <xref linkend="gnome-menus"/></para>
 
   </sect2>
diff --git a/gnome/add/eog.xml b/gnome/add/eog.xml
index f0fe487082..e7c3577336 100644
--- a/gnome/add/eog.xml
+++ b/gnome/add/eog.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">eog-&eog-version;.tar</keyword>
+      <keyword role="ftptdir">eog</keyword>
+    </keywordset>
   </sect1info>
 
   <title>EOG-&eog-version;</title>
@@ -58,11 +62,11 @@
     <bridgehead renderas="sect3">EOG Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/> and
+    <para role="required"><xref linkend="libgnomeui"/> and
     <xref linkend="libgnomeprintui"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="libjpeg"/>,
+    <para role="optional"><xref linkend="libjpeg"/>,
     <xref linkend="libexif"/> and
     <xref linkend="lcms"/></para>
 
diff --git a/gnome/add/epiphany.xml b/gnome/add/epiphany.xml
index edfe9557ad..87e06908a9 100644
--- a/gnome/add/epiphany.xml
+++ b/gnome/add/epiphany.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">epiphany-&epiphany-version;.tar</keyword>
+      <keyword role="ftptdir">epiphany</keyword>
+    </keywordset>
   </sect1info>
 
   <title>Epiphany-&epiphany-version;</title>
@@ -58,7 +62,7 @@
     <bridgehead renderas="sect3">Epiphany Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-desktop"/>,
+    <para role="required"><xref linkend="gnome-desktop"/>,
     <xref linkend="libgnomeprintui"/>,
     <xref linkend="dbus"/>,
     <xref linkend="which"/>,
@@ -68,7 +72,7 @@
     <xref linkend="thunderbird"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="startup-notification"/>,
+    <para role="optional"><xref linkend="startup-notification"/>,
     <ulink url="http://ftp.gnome.org/pub/GNOME/sources/gnome-python/">GNOME-Python</ulink>
     (requires <ulink url="http://www.pygtk.org/">PyGTK</ulink> and can use
     <ulink url="http://ftp.gnome.org/pub/GNOME/sources/pyorbit/">PyORBit</ulink>) and
diff --git a/gnome/add/evince.xml b/gnome/add/evince.xml
index f75cbcab63..a7287cba7c 100644
--- a/gnome/add/evince.xml
+++ b/gnome/add/evince.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">evince-&evince-version;.tar</keyword>
+      <keyword role="ftptdir">evince</keyword>
+    </keywordset>
   </sect1info>
 
   <title>Evince-&evince-version;</title>
@@ -68,14 +72,14 @@
     <bridgehead renderas="sect3">Evince Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/>,
+    <para role="required"><xref linkend="libgnomeui"/>,
     <xref linkend="libgnomeprintui"/>,
     <xref linkend="poppler"/> (built with <application>GTK+</application> support),
     <xref linkend="espgs"/> or <xref linkend="gs"/> and
     <xref linkend="which"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="nautilus"/>,
+    <para role="optional"><xref linkend="nautilus"/>,
     <xref linkend="dbus"/>,
     <xref linkend="libtiff"/>,
     <xref linkend="tex"/>,
diff --git a/gnome/add/evolution-data-server.xml b/gnome/add/evolution-data-server.xml
index 109e2f2c9e..c3fcb78243 100644
--- a/gnome/add/evolution-data-server.xml
+++ b/gnome/add/evolution-data-server.xml
@@ -19,6 +19,10 @@ xreflabel="Evolution Data Server-&evolution-data-server-version;">
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">evolution-data-server-&evolution-data-server-version;.tar</keyword>
+      <keyword role="ftptdir">evolution-data-server</keyword>
+    </keywordset>
   </sect1info>
 
   <title>Evolution Data Server-&evolution-data-server-version;</title>
@@ -61,11 +65,11 @@ xreflabel="Evolution Data Server-&evolution-data-server-version;">
     <bridgehead renderas="sect3">Evolution Data Server Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/> and
+    <para role="required"><xref linkend="libgnomeui"/> and
     <xref linkend="libsoup"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="openldap"/>,
+    <para role="optional"><xref linkend="openldap"/>,
     <xref linkend="mozilla"/> or
     <xref linkend="firefox"/> or
     <xref linkend="thunderbird"/> (NSS/NSPR libs for SSL and S/MIME support),
diff --git a/gnome/add/file-roller.xml b/gnome/add/file-roller.xml
index f3082f1398..0690a44bf7 100644
--- a/gnome/add/file-roller.xml
+++ b/gnome/add/file-roller.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">file-roller-&file-roller-version;.tar</keyword>
+      <keyword role="ftptdir">file-roller</keyword>
+    </keywordset>
   </sect1info>
 
   <title>File Roller-&file-roller-version;</title>
@@ -58,7 +62,7 @@
     <bridgehead renderas="sect3">File Roller Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="nautilus"/></para>
+    <para role="required"><xref linkend="nautilus"/></para>
 
   </sect2>
 
diff --git a/gnome/add/gal.xml b/gnome/add/gal.xml
index 136b93019b..2f95708491 100644
--- a/gnome/add/gal.xml
+++ b/gnome/add/gal.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gal-&gal-version;.tar</keyword>
+      <keyword role="ftptdir">gal</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GAL-&gal-version;</title>
@@ -59,11 +63,11 @@
     <bridgehead renderas="sect3">GAL Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/> and
+    <para role="required"><xref linkend="libgnomeui"/> and
     <xref linkend="libgnomeprintui"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="gtk-doc"/></para>
 
   </sect2>
 
diff --git a/gnome/add/gcalctool.xml b/gnome/add/gcalctool.xml
index 1013e1604c..9026cfd233 100644
--- a/gnome/add/gcalctool.xml
+++ b/gnome/add/gcalctool.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gcalctool-&gcalctool-version;.tar</keyword>
+      <keyword role="ftptdir">gcalctool</keyword>
+    </keywordset>
   </sect1info>
 
   <title>gcalctool-&gcalctool-version;</title>
@@ -59,7 +63,7 @@
     <bridgehead renderas="sect3">gcalctool Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/> and
+    <para role="required"><xref linkend="libgnomeui"/> and
     <xref linkend="scrollkeeper"/></para>
 
   </sect2>
diff --git a/gnome/add/gconf-editor.xml b/gnome/add/gconf-editor.xml
index 7b7d01c965..670991da5d 100644
--- a/gnome/add/gconf-editor.xml
+++ b/gnome/add/gconf-editor.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gconf-editor-&gconf-editor-version;.tar</keyword>
+      <keyword role="ftptdir">gconf-editor</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GConf Editor-&gconf-editor-version;</title>
@@ -58,7 +62,7 @@
     <bridgehead renderas="sect3">GConf Editor Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/></para>
+    <para role="required"><xref linkend="libgnomeui"/></para>
 
   </sect2>
 
diff --git a/gnome/add/gdm.xml b/gnome/add/gdm.xml
index c35ff47ba5..12884e329b 100644
--- a/gnome/add/gdm.xml
+++ b/gnome/add/gdm.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gdm-&gdm-version;.tar</keyword>
+      <keyword role="ftptdir">gdm</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GDM-&gdm-version;</title>
@@ -58,12 +62,12 @@
     <bridgehead renderas="sect3">GDM Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/>,
+    <para role="required"><xref linkend="libgnomeui"/>,
     <xref linkend="scrollkeeper"/> and
     <xref linkend="librsvg"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="linux-pam"/> and
+    <para role="optional"><xref linkend="linux-pam"/> and
     <xref linkend="tcpwrappers"/></para>
 
   </sect2>
diff --git a/gnome/add/gedit.xml b/gnome/add/gedit.xml
index 3ac68c1afd..7cf521c7df 100644
--- a/gnome/add/gedit.xml
+++ b/gnome/add/gedit.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gedit-&gedit-version;.tar</keyword>
+      <keyword role="ftptdir">gedit</keyword>
+    </keywordset>
   </sect1info>
 
   <title>gedit-&gedit-version;</title>
@@ -57,10 +61,11 @@
     <bridgehead renderas="sect3">gedit Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="eel"/> and <xref linkend="gtksourceview"/></para>
+    <para role="required"><xref linkend="eel"/> and
+    <xref linkend="gtksourceview"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="aspell"/></para>
+    <para role="optional"><xref linkend="aspell"/></para>
 
   </sect2>
 
diff --git a/gnome/add/ggv.xml b/gnome/add/ggv.xml
index 2147450681..20803c2f40 100644
--- a/gnome/add/ggv.xml
+++ b/gnome/add/ggv.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">ggv-&ggv-version;.tar</keyword>
+      <keyword role="ftptdir">ggv</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GGV-&ggv-version;</title>
@@ -57,11 +61,11 @@
     <bridgehead renderas="sect3">GGV Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/>, and
+    <para role="required"><xref linkend="libgnomeui"/>, and
     <xref linkend="espgs"/> or <xref linkend="gs"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="cups"/> or <xref linkend="LPRng"/></para>
+    <para role="optional"><xref linkend="cups"/> or <xref linkend="LPRng"/></para>
 
   </sect2>
 
diff --git a/gnome/add/gnome-audio.xml b/gnome/add/gnome-audio.xml
index eaafb7e2b1..897eaddb5c 100644
--- a/gnome/add/gnome-audio.xml
+++ b/gnome/add/gnome-audio.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-audio-&gnome-audio-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-audio</keyword>
+    </keywordset>
   </sect1info>
 
   <title>gnome-audio-&gnome-audio-version;</title>
diff --git a/gnome/add/gnome-games.xml b/gnome/add/gnome-games.xml
index 22a0984070..c3a2634901 100644
--- a/gnome/add/gnome-games.xml
+++ b/gnome/add/gnome-games.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-games-&gnome-games-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-games</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GNOME Games-&gnome-games-version;</title>
@@ -62,12 +66,12 @@
     <bridgehead renderas="sect3">GNOME Games Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/>,
+    <para role="required"><xref linkend="libgnomeui"/>,
     <xref linkend="scrollkeeper"/> and
     <xref linkend="librsvg"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="guile"/>
+    <para role="optional"><xref linkend="guile"/>
     (required to build the AisleRiot solitaire games),
     <ulink url="http://www.porchdogsoft.com/products/howl/">Howl</ulink> and
     <ulink url="http://www.5z.com/jirka/gob.html">GOB2</ulink></para>
diff --git a/gnome/add/gnome-keyring-manager.xml b/gnome/add/gnome-keyring-manager.xml
index 7863919042..b981a9084b 100644
--- a/gnome/add/gnome-keyring-manager.xml
+++ b/gnome/add/gnome-keyring-manager.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-keyring-manager-&gnome-keyring-manager-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-keyring-manager</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GNOME Keyring Manager-&gnome-keyring-manager-version;</title>
@@ -58,7 +62,7 @@
     <bridgehead renderas="sect3">GNOME Keyring Manager Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/> and
+    <para role="required"><xref linkend="libgnomeui"/> and
     <xref linkend="gnome-doc-utils"/></para>
 
   </sect2>
diff --git a/gnome/add/gnome-mag.xml b/gnome/add/gnome-mag.xml
index 59718f0575..b2ffcaf9bf 100644
--- a/gnome/add/gnome-mag.xml
+++ b/gnome/add/gnome-mag.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-mag-&gnome-mag-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-mag</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GNOME Magnifier-&gnome-mag-version;</title>
@@ -69,7 +73,7 @@
     <bridgehead renderas="sect3">GNOME Magnifier Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="at-spi"/></para>
+    <para role="required"><xref linkend="at-spi"/></para>
 
     <bridgehead renderas="sect4">Optional (For
     <application>XFree86</application> Only)</bridgehead>
@@ -82,7 +86,7 @@
     then <ulink
     url="http://www.freedesktop.org/wiki/Software_2fxlibs">DamageExt</ulink>)</para>
 
-    <para>* Ensure you created the <filename>xextensions.pc</filename> file as shown
+    <para role="optional">* Ensure you created the <filename>xextensions.pc</filename> file as shown
     in the <xref linkend="xfree86"/> instructions.</para>
 
   </sect2>
diff --git a/gnome/add/gnome-media.xml b/gnome/add/gnome-media.xml
index a3701db247..23c91bb477 100644
--- a/gnome/add/gnome-media.xml
+++ b/gnome/add/gnome-media.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-media-&gnome-media-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-media</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GNOME Media-&gnome-media-version;</title>
@@ -57,14 +61,14 @@
     <bridgehead renderas="sect3">GNOME Media Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="nautilus-cd-burner"/></para>
+    <para role="required"><xref linkend="nautilus-cd-burner"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="gst-plugins"/> (required for the mixer and
-    recorder to work)</para>
+    <para role="recommended"><xref linkend="gst-plugins"/> (required for the
+    mixer and recorder to work)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="sendmail"/> (or other
+    <para role="optional"><xref linkend="sendmail"/> (or other
     <ulink url="../server/mail.html">MTA</ulink> that provides
     <command>/usr/sbin/sendmail</command>) and
     <xref linkend="docbook-utils"/></para>
diff --git a/gnome/add/gnome-netstatus.xml b/gnome/add/gnome-netstatus.xml
index feb65c4483..b1793308a0 100644
--- a/gnome/add/gnome-netstatus.xml
+++ b/gnome/add/gnome-netstatus.xml
@@ -19,6 +19,10 @@ xreflabel="GNOME Netstatus-&gnome-netstatus-version;">
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-netstatus-&gnome-netstatus-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-netstatus</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GNOME Netstatus-&gnome-netstatus-version;</title>
@@ -61,7 +65,7 @@ xreflabel="GNOME Netstatus-&gnome-netstatus-version;">
     <bridgehead renderas="sect3">GNOME Netstatus Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-<para><xref linkend="gnome-panel"/></para>
+    <para role="required"><xref linkend="gnome-panel"/></para>
 
   </sect2>
 
diff --git a/gnome/add/gnome-speech.xml b/gnome/add/gnome-speech.xml
index e7e676fb5f..a4ce07bb26 100644
--- a/gnome/add/gnome-speech.xml
+++ b/gnome/add/gnome-speech.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-speech-&gnome-speech-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-speech</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GNOME Speech-&gnome-speech-version;</title>
@@ -69,10 +73,10 @@
     <bridgehead renderas="sect3">GNOME Speech Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libbonobo"/></para>
+    <para role="required"><xref linkend="libbonobo"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="java-access-bridge"/>,
+    <para role="optional"><xref linkend="java-access-bridge"/>,
     <xref linkend="freetts"/>,
     <ulink url="http://www.cstr.ed.ac.uk/projects/festival/">Festival</ulink>,
     <ulink url="http://www.ibm.com/software/voice/viavoice/">ViaVoice</ulink>,
diff --git a/gnome/add/gnome-system-monitor.xml b/gnome/add/gnome-system-monitor.xml
index d4bf84a3ff..4c27e180dd 100644
--- a/gnome/add/gnome-system-monitor.xml
+++ b/gnome/add/gnome-system-monitor.xml
@@ -19,6 +19,10 @@ xreflabel="GNOME System Monitor-&gnome-system-monitor-version;">
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-system-monitor-&gnome-system-monitor-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-system-monitor</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GNOME System Monitor-&gnome-system-monitor-version;</title>
@@ -61,7 +65,7 @@ xreflabel="GNOME System Monitor-&gnome-system-monitor-version;">
     <bridgehead renderas="sect3">GNOME System Monitor Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/>,
+    <para role="required"><xref linkend="libgnomeui"/>,
     <xref linkend="libwnck"/> and
     <xref linkend="libgtop"/></para>
 
diff --git a/gnome/add/gnome-utils.xml b/gnome/add/gnome-utils.xml
index b79821ec48..4c0b8978f2 100644
--- a/gnome/add/gnome-utils.xml
+++ b/gnome/add/gnome-utils.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-utils-&gnome-utils-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-utils</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GNOME Utilities-&gnome-utils-version;</title>
@@ -58,12 +62,12 @@
     <bridgehead renderas="sect3">GNOME Utilities Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-panel"/> and
+    <para role="required"><xref linkend="gnome-panel"/> and
     <xref linkend="libgnomeprintui"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="linux-pam"/> (only if consolehelper is also installed)
-    and <xref linkend="hal"/></para>
+    <para role="optional"><xref linkend="linux-pam"/> (only if consolehelper
+    is also installed) and <xref linkend="hal"/></para>
 
   </sect2>
 
diff --git a/gnome/add/gnome-volume-manager.xml b/gnome/add/gnome-volume-manager.xml
index 76a897d7fc..b56084b24d 100644
--- a/gnome/add/gnome-volume-manager.xml
+++ b/gnome/add/gnome-volume-manager.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnome-volume-manager-&gnome-volume-manager-version;.tar</keyword>
+      <keyword role="ftptdir">gnome-volume-manager</keyword>
+    </keywordset>
   </sect1info>
 
   <title>gnome-volume-manager-&gnome-volume-manager-version;</title>
@@ -68,11 +72,11 @@
     <bridgehead renderas="sect3">gnome-volume-manager Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/> and
+    <para role="required"><xref linkend="libgnomeui"/> and
     <xref linkend="hal"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="nautilus"/></para>
+    <para role="optional"><xref linkend="nautilus"/></para>
 
   </sect2>
 
diff --git a/gnome/add/gnomemeeting.xml b/gnome/add/gnomemeeting.xml
index 1fa46f3f27..7927d9a9bd 100644
--- a/gnome/add/gnomemeeting.xml
+++ b/gnome/add/gnomemeeting.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnomemeeting-&gnomemeeting-version;.tar</keyword>
+      <keyword role="ftptdir">gnomemeeting</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GnomeMeeting-&gnomemeeting-version;</title>
@@ -62,7 +66,7 @@
     <bridgehead renderas="sect3">GnomeMeeting Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/>,
+    <para role="required"><xref linkend="libgnomeui"/>,
     <xref linkend="scrollkeeper"/>,
     <xref linkend="evolution-data-server"/>,
     <xref linkend="openldap"/>,
@@ -71,7 +75,7 @@
     url="http://sourceforge.net/projects/openh323">OpenH323-1.15.6</ulink></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="sdl"/> (required for full-screen video),
+    <para role="optional"><xref linkend="sdl"/> (required for full-screen video),
     <xref linkend="dbus"/> and
     <ulink url="http://www.porchdogsoft.com/products/howl/">Howl</ulink></para>
 
diff --git a/gnome/add/gnopernicus.xml b/gnome/add/gnopernicus.xml
index 02c9a90a3d..f69b833596 100644
--- a/gnome/add/gnopernicus.xml
+++ b/gnome/add/gnopernicus.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gnopernicus-&gnopernicus-version;.tar</keyword>
+      <keyword role="ftptdir">gnopernicus</keyword>
+    </keywordset>
   </sect1info>
 
   <title>Gnopernicus-&gnopernicus-version;</title>
@@ -59,12 +63,12 @@
     <bridgehead renderas="sect3">Gnopernicus Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgail-gnome"/>,
+    <para role="required"><xref linkend="libgail-gnome"/>,
     <xref linkend="gnome-speech"/> and
     <xref linkend="gnome-mag"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/> and
+    <para role="optional"><xref linkend="gtk-doc"/> and
     <ulink url="http://www.mielke.cc/brltty/">BRLTTY</ulink></para>
 
   </sect2>
diff --git a/gnome/add/gok.xml b/gnome/add/gok.xml
index 862de6759a..6d6a8bb05a 100644
--- a/gnome/add/gok.xml
+++ b/gnome/add/gok.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gok-&gok-version;.tar</keyword>
+      <keyword role="ftptdir">gok</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GOK-&gok-version;</title>
@@ -58,14 +62,14 @@
     <bridgehead renderas="sect3">GOK Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/>,
+    <para role="required"><xref linkend="libgnomeui"/>,
     <xref linkend="scrollkeeper"/>,
     <xref linkend="libwnck"/>,
     <xref linkend="at-spi"/> and
     <xref linkend="gnome-speech"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="gtk-doc"/></para>
 
   </sect2>
 
diff --git a/gnome/add/gpdf.xml b/gnome/add/gpdf.xml
index 838106c782..a86e0999bd 100644
--- a/gnome/add/gpdf.xml
+++ b/gnome/add/gpdf.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gpdf-&gpdf-version;.tar</keyword>
+      <keyword role="ftptdir">gpdf</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GPdf-&gpdf-version;</title>
@@ -59,11 +63,11 @@
     <bridgehead renderas="sect3">GPdf Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/> and
+    <para role="required"><xref linkend="libgnomeui"/> and
     <xref linkend="libgnomeprintui"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="tex"/> and
+    <para role="optional"><xref linkend="tex"/> and
     <ulink
     url="http://packages.qa.debian.org/libp/libpaper.html">libpaper</ulink></para>
 
diff --git a/gnome/add/gtkhtml.xml b/gnome/add/gtkhtml.xml
index 4c85e35b54..a53fd2ebe1 100644
--- a/gnome/add/gtkhtml.xml
+++ b/gnome/add/gtkhtml.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gtkhtml-&gtkhtml-version;.tar</keyword>
+      <keyword role="ftptdir">gtkhtml</keyword>
+    </keywordset>
   </sect1info>
 
   <title>GtkHTML-&gtkhtml-version;</title>
@@ -59,13 +63,13 @@
     <bridgehead renderas="sect3">GtkHTML Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/>,
+    <para role="required"><xref linkend="libgnomeui"/>,
     <xref linkend="gail"/>,
     <xref linkend="gnome-icon-theme"/> and
     <xref linkend="libgnomeprintui"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="libsoup"/></para>
+    <para role="optional"><xref linkend="libsoup"/></para>
 
   </sect2>
 
diff --git a/gnome/add/gtksourceview.xml b/gnome/add/gtksourceview.xml
index 7b1586ea4c..0d31b56cb9 100644
--- a/gnome/add/gtksourceview.xml
+++ b/gnome/add/gtksourceview.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gtksourceview-&gtksourceview-version;.tar</keyword>
+      <keyword role="ftptdir">gtksourceview</keyword>
+    </keywordset>
   </sect1info>
 
   <title>gtksourceview-&gtksourceview-version;</title>
@@ -59,11 +63,11 @@
     <bridgehead renderas="sect3">gtksourceview Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-vfs"/> and
+    <para role="required"><xref linkend="gnome-vfs"/> and
     <xref linkend="libgnomeprintui"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="gtk-doc"/></para>
 
   </sect2>
 
diff --git a/gnome/add/gucharmap.xml b/gnome/add/gucharmap.xml
index c7a09b13a7..62c690dfb9 100644
--- a/gnome/add/gucharmap.xml
+++ b/gnome/add/gucharmap.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">gucharmap-&gucharmap-version;.tar</keyword>
+      <keyword role="ftptdir">gucharmap</keyword>
+    </keywordset>
   </sect1info>
 
   <title>gucharmap-&gucharmap-version;</title>
@@ -60,12 +64,13 @@
     <bridgehead renderas="sect3">gucharmap Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="intltool"/>,
+    <para role="required"><xref linkend="intltool"/>,
     <xref linkend="gtk2"/> and
     <xref linkend="gnome-doc-utils"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="libgnomeui"/> and <xref linkend="scrollkeeper"/></para>
+    <para role="optional"><xref linkend="libgnomeui"/> and
+    <xref linkend="scrollkeeper"/></para>
 
   </sect2>
 
diff --git a/gnome/add/java-access-bridge.xml b/gnome/add/java-access-bridge.xml
index 26058e16a3..999c47ac5d 100644
--- a/gnome/add/java-access-bridge.xml
+++ b/gnome/add/java-access-bridge.xml
@@ -19,6 +19,10 @@ xreflabel="Java Access Bridge-&java-access-bridge-version;">
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">java-access-bridge-&java-access-bridge-version;.tar</keyword>
+      <keyword role="ftptdir">java-access-bridge</keyword>
+    </keywordset>
   </sect1info>
 
   <title>Java Access Bridge-&java-access-bridge-version;</title>
@@ -61,7 +65,7 @@ xreflabel="Java Access Bridge-&java-access-bridge-version;">
     <bridgehead renderas="sect3">Java Access Bridge Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="at-spi"/> and <xref linkend="jdk"/></para>
+    <para role="required"><xref linkend="at-spi"/> and <xref linkend="jdk"/></para>
 
   </sect2>
 
diff --git a/gnome/add/libgail-gnome.xml b/gnome/add/libgail-gnome.xml
index 870b0256b4..5b67b857c7 100644
--- a/gnome/add/libgail-gnome.xml
+++ b/gnome/add/libgail-gnome.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libgail-gnome-&libgail-gnome-version;.tar</keyword>
+      <keyword role="ftptdir">libgail-gnome</keyword>
+    </keywordset>
   </sect1info>
 
   <title>libgail-gnome-&libgail-gnome-version;</title>
@@ -60,7 +64,7 @@
     <bridgehead renderas="sect3">libgail-gnome Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-panel"/> and <xref linkend="at-spi"/></para>
+    <para role="required"><xref linkend="gnome-panel"/> and <xref linkend="at-spi"/></para>
 
   </sect2>
 
diff --git a/gnome/add/libgnomecups.xml b/gnome/add/libgnomecups.xml
index d41c983688..261df0cce1 100644
--- a/gnome/add/libgnomecups.xml
+++ b/gnome/add/libgnomecups.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libgnomecups-&libgnomecups-version;.tar</keyword>
+      <keyword role="ftptdir">libgnomecups</keyword>
+    </keywordset>
   </sect1info>
 
   <title>libgnomecups-&libgnomecups-version;</title>
@@ -60,7 +64,7 @@
     <bridgehead renderas="sect3">libgnomecups Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="cups"/>,
+    <para role="required"><xref linkend="cups"/>,
     <xref linkend="glib2"/> and
     <xref linkend="intltool"/></para>
 
diff --git a/gnome/add/libgnomeprint.xml b/gnome/add/libgnomeprint.xml
index 9032e2945f..dc42a1f76a 100644
--- a/gnome/add/libgnomeprint.xml
+++ b/gnome/add/libgnomeprint.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libgnomeprint-&libgnomeprint-version;.tar</keyword>
+      <keyword role="ftptdir">libgnomeprint</keyword>
+    </keywordset>
   </sect1info>
 
   <title>libgnomeprint-&libgnomeprint-version;</title>
@@ -56,14 +60,14 @@
     <bridgehead renderas="sect3">libgnomeprint Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="pango"/>,
+    <para role="required"><xref linkend="pango"/>,
     <xref linkend="libart_lgpl"/>,
     <xref linkend="fontconfig"/>,
     <xref linkend="libxml2"/> and
     <xref linkend="perl-xml-parser"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="cups"/> (and <xref linkend="libgnomecups"/>),
+    <para role="optional"><xref linkend="cups"/> (and <xref linkend="libgnomecups"/>),
     <xref linkend="popt"/> (only used by the test suite programs),
     <xref linkend="gtk-doc"/> and
     <xref linkend="docbook-utils"/></para>
diff --git a/gnome/add/libgnomeprintui.xml b/gnome/add/libgnomeprintui.xml
index c36d5adc9b..93efc90741 100644
--- a/gnome/add/libgnomeprintui.xml
+++ b/gnome/add/libgnomeprintui.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libgnomeprintui-&libgnomeprintui-version;.tar</keyword>
+      <keyword role="ftptdir">libgnomeprintui</keyword>
+    </keywordset>
   </sect1info>
 
   <title>libgnomeprintui-&libgnomeprintui-version;</title>
@@ -58,12 +62,12 @@
     <bridgehead renderas="sect3">libgnomeprintui Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomecanvas"/>,
+    <para role="required"><xref linkend="libgnomecanvas"/>,
     <xref linkend="gnome-icon-theme"/> and
     <xref linkend="libgnomeprint"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="gtk-doc"/></para>
 
   </sect2>
 
diff --git a/gnome/add/libgtkhtml.xml b/gnome/add/libgtkhtml.xml
index cbe85310ca..f277eb00b9 100644
--- a/gnome/add/libgtkhtml.xml
+++ b/gnome/add/libgtkhtml.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">libgtkhtml-&libgtkhtml-version;.tar</keyword>
+      <keyword role="ftptdir">libgtkhtml</keyword>
+    </keywordset>
   </sect1info>
 
   <title>libgtkhtml-&libgtkhtml-version;</title>
@@ -58,11 +62,11 @@
     <bridgehead renderas="sect3">libgtkhtml Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gtk2"/> and
+    <para role="required"><xref linkend="gtk2"/> and
     <xref linkend="libxml2"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gail"/> and
+    <para role="optional"><xref linkend="gail"/> and
     <xref linkend="gnome-vfs"/></para>
 
   </sect2>
diff --git a/gnome/add/nautilus-cd-burner.xml b/gnome/add/nautilus-cd-burner.xml
index 22cdaf6a33..e48988178d 100644
--- a/gnome/add/nautilus-cd-burner.xml
+++ b/gnome/add/nautilus-cd-burner.xml
@@ -19,6 +19,10 @@ xreflabel="Nautilus CD Burner-&nautilus-cd-burner-version;">
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">nautilus-cd-burner-&nautilus-cd-burner-version;.tar</keyword>
+      <keyword role="ftptdir">nautilus-cd-burner</keyword>
+    </keywordset>
   </sect1info>
 
   <title>Nautilus CD Burner-&nautilus-cd-burner-version;</title>
@@ -60,11 +64,11 @@ xreflabel="Nautilus CD Burner-&nautilus-cd-burner-version;">
     <bridgehead renderas="sect3">Nautilus CD Burner Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="nautilus"/> and
+    <para role="required"><xref linkend="nautilus"/> and
     <xref linkend="cdrtools"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="hal"/></para>
+    <para role="optional"><xref linkend="hal"/></para>
 
   </sect2>
 
diff --git a/gnome/add/sound-juicer.xml b/gnome/add/sound-juicer.xml
index c05e8b52d1..e9d96eee4d 100644
--- a/gnome/add/sound-juicer.xml
+++ b/gnome/add/sound-juicer.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">sound-juicer-&sound-juicer-version;.tar</keyword>
+      <keyword role="ftptdir">sound-juicer</keyword>
+    </keywordset>
   </sect1info>
 
   <title>Sound Juicer-&sound-juicer-version;</title>
@@ -65,7 +69,7 @@
     <bridgehead renderas="sect3">Sound Juicer Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-media"/>,
+    <para role="required"><xref linkend="gnome-media"/>,
     <xref linkend="gst-plugins"/> and
     <xref linkend="libmusicbrainz"/></para>
 
diff --git a/gnome/add/system-tools-backends.xml b/gnome/add/system-tools-backends.xml
index ae74577dea..aaac8dca97 100644
--- a/gnome/add/system-tools-backends.xml
+++ b/gnome/add/system-tools-backends.xml
@@ -19,6 +19,10 @@ xreflabel="system-tools-backends-&system-tools-backends-version;">
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">system-tools-backends-&system-tools-backends-version;.tar</keyword>
+      <keyword role="ftptdir">system-tools-backends</keyword>
+    </keywordset>
   </sect1info>
 
   <title>system-tools-backends-&system-tools-backends-version;</title>
@@ -60,7 +64,7 @@ xreflabel="system-tools-backends-&system-tools-backends-version;">
     <bridgehead renderas="sect3">system-tools-backends Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="intltool"/></para>
+    <para role="required"><xref linkend="intltool"/></para>
 
   </sect2>
 
diff --git a/gnome/add/totem.xml b/gnome/add/totem.xml
index 145c4fcd3b..f0c40da13f 100644
--- a/gnome/add/totem.xml
+++ b/gnome/add/totem.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">totem-&totem-version;.tar</keyword>
+      <keyword role="ftptdir">totem</keyword>
+    </keywordset>
   </sect1info>
 
   <title>Totem-&totem-version;</title>
@@ -64,7 +68,7 @@
     <bridgehead renderas="sect3">Totem Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-icon-theme"/>,
+    <para role="required"><xref linkend="gnome-icon-theme"/>,
     <xref linkend="gnome-desktop"/>,
     <xref linkend="iso-codes"/>,
     <xref linkend="libmusicbrainz"/> and
@@ -74,7 +78,7 @@
     GStreamer FFmpeg plug-in</ulink>)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="nautilus"/>,
+    <para role="optional"><xref linkend="nautilus"/>,
     <xref linkend="mozilla"/> or <xref linkend="firefox"/> (to build
     the browser plug-in, requires <xref linkend="dbus"/> also),
     <ulink url="http://www.evation.com/libirman/libirman.html">libirman</ulink>,
diff --git a/gnome/add/zenity.xml b/gnome/add/zenity.xml
index d564052e2b..759fe445f6 100644
--- a/gnome/add/zenity.xml
+++ b/gnome/add/zenity.xml
@@ -18,6 +18,10 @@
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">zenity-&zenity-version;.tar</keyword>
+      <keyword role="ftptdir">zenity</keyword>
+    </keywordset>
   </sect1info>
 
   <title>Zenity-&zenity-version;</title>
@@ -60,7 +64,7 @@
     <bridgehead renderas="sect3">Zenity Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomecanvas"/> and
+    <para role="required"><xref linkend="libgnomecanvas"/> and
     <xref linkend="gnome-doc-utils"/></para>
 
   </sect2>