Index: postlfs/editors/bluefish.xml
===================================================================
--- postlfs/editors/bluefish.xml	(revision 8ba8ab5693979f15cc056fcd282b78b2a835a27c)
+++ postlfs/editors/bluefish.xml	(revision a6ac43bd99ad644b540219f52711b4c8ee49f1ae)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">bluefish-&bluefish-version;.tar</keyword>
+      <keyword role="ftptdir">bluefish</keyword>
+    </keywordset>
   </sect1info>
 
@@ -60,9 +64,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gtk2"/> and
+    <para role="required"><xref linkend="gtk2"/> and
     <xref linkend="pcre"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gnome-vfs"/> (for remote files),
+    <para role="optional"><xref linkend="gnome-vfs"/> (for remote files),
     <xref linkend="aspell"/> (for spellchecking),
     <xref linkend="libgnomeui"/>,
Index: postlfs/editors/ed.xml
===================================================================
--- postlfs/editors/ed.xml	(revision 8ba8ab5693979f15cc056fcd282b78b2a835a27c)
+++ postlfs/editors/ed.xml	(revision a6ac43bd99ad644b540219f52711b4c8ee49f1ae)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">ed-&ed-version;.tar</keyword>
+      <keyword role="ftptdir">ed</keyword>
+    </keywordset>
   </sect1info>
 
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision 8ba8ab5693979f15cc056fcd282b78b2a835a27c)
+++ postlfs/editors/emacs.xml	(revision a6ac43bd99ad644b540219f52711b4c8ee49f1ae)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">emacs-&emacs-version;.tar</keyword>
+      <keyword role="ftptdir">emacs</keyword>
+    </keywordset>
   </sect1info>
 
@@ -58,5 +62,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    <para role="optional">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
     <xref linkend="libjpeg"/>,
     <xref linkend="libpng"/>,
Index: postlfs/editors/joe.xml
===================================================================
--- postlfs/editors/joe.xml	(revision 8ba8ab5693979f15cc056fcd282b78b2a835a27c)
+++ postlfs/editors/joe.xml	(revision a6ac43bd99ad644b540219f52711b4c8ee49f1ae)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">joe-&joe-version;.tar</keyword>
+      <keyword role="ftptdir">joe</keyword>
+    </keywordset>
   </sect1info>
 
Index: postlfs/editors/nano.xml
===================================================================
--- postlfs/editors/nano.xml	(revision 8ba8ab5693979f15cc056fcd282b78b2a835a27c)
+++ postlfs/editors/nano.xml	(revision a6ac43bd99ad644b540219f52711b4c8ee49f1ae)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="nano">
+<sect1 id="nano" xreflabel="nano-&nano-version;">
   <?dbhtml filename="nano.html"?>
 
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">nano-&nano-version;.tar</keyword>
+      <keyword role="ftptdir">nano</keyword>
+    </keywordset>
   </sect1info>
 
@@ -59,5 +63,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="slang"/></para>
+    <para role="optional"><xref linkend="slang"/></para>
 
   </sect2>
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision 8ba8ab5693979f15cc056fcd282b78b2a835a27c)
+++ postlfs/editors/vim.xml	(revision a6ac43bd99ad644b540219f52711b4c8ee49f1ae)
@@ -19,4 +19,8 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
+    <keywordset>
+      <keyword role="package">vim-&vim-version;.tar</keyword>
+      <keyword role="ftptdir">vim</keyword>
+    </keywordset>
   </sect1info>
 
@@ -80,8 +84,9 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
+    <para role="recommended">X (<xref linkend="xfree86"/> or
+    <xref linkend="xorg"/>)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gtk2"/>,
+    <para role="optional"><xref linkend="gtk2"/>,
     <xref linkend="lesstif"/>,
     <xref linkend="python"/>,
