Index: general/genutils/intltool.xml
===================================================================
--- general/genutils/intltool.xml	(revision 10a2ee5eb2c7193ffe448106010ca7be998a0671)
+++ general/genutils/intltool.xml	(revision ba4b31cf2cc877757bea0dcb5351b53b3449e103)
@@ -63,5 +63,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="perl-modules"/>: XML-Parser</para>
+    <para><xref linkend="perl-xml-parser"/></para>
 
   </sect2>
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision 10a2ee5eb2c7193ffe448106010ca7be998a0671)
+++ general/graphlib/fontconfig.xml	(revision ba4b31cf2cc877757bea0dcb5351b53b3449e103)
@@ -73,6 +73,6 @@
     <note>
       <para>If you have <application>DocBook-utils</application> installed,
-      you must also have <xref linkend="perl-modules"/>: SGMLSpm-1.03ii installed
-      also, or the <application>Fontconfig</application> build will fail.</para>
+      you must also have <xref linkend="perl-sgmlspm"/> installed also, or the
+      <application>Fontconfig</application> build will fail.</para>
     </note>
 
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 10a2ee5eb2c7193ffe448106010ca7be998a0671)
+++ general/prog/perl-modules.xml	(revision ba4b31cf2cc877757bea0dcb5351b53b3449e103)
@@ -377,5 +377,5 @@
 
     <bridgehead renderas="sect3" id="perl-tk"
-    xreflabel="Tk">The Tk Module</bridgehead>
+    xreflabel="Perl-Tk">The Tk Module</bridgehead>
 
     <indexterm zone="perl-modules perl-tk">
Index: gnome/add/libgnomeprint.xml
===================================================================
--- gnome/add/libgnomeprint.xml	(revision 10a2ee5eb2c7193ffe448106010ca7be998a0671)
+++ gnome/add/libgnomeprint.xml	(revision ba4b31cf2cc877757bea0dcb5351b53b3449e103)
@@ -62,5 +62,5 @@
     <xref linkend="popt"/>,
     <xref linkend="libxml2"/> and
-    <xref linkend="perl-modules"/>: XML-Parser</para>
+    <xref linkend="perl-xml-parser"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: gnome/core/gnome-icon-theme.xml
===================================================================
--- gnome/core/gnome-icon-theme.xml	(revision 10a2ee5eb2c7193ffe448106010ca7be998a0671)
+++ gnome/core/gnome-icon-theme.xml	(revision ba4b31cf2cc877757bea0dcb5351b53b3449e103)
@@ -60,5 +60,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para><xref linkend="hicolor-icon-theme"/> and
-    <xref linkend="perl-modules"/>: XML-Parser</para>
+    <xref linkend="perl-xml-parser"/></para>
 
   </sect2>
Index: gnome/core/gnome-mime-data.xml
===================================================================
--- gnome/core/gnome-mime-data.xml	(revision 10a2ee5eb2c7193ffe448106010ca7be998a0671)
+++ gnome/core/gnome-mime-data.xml	(revision ba4b31cf2cc877757bea0dcb5351b53b3449e103)
@@ -59,5 +59,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="perl-modules"/>: XML-Parser</para>
+    <para><xref linkend="perl-xml-parser"/></para>
 
   </sect2>
Index: gnome/core/libbonobo.xml
===================================================================
--- gnome/core/libbonobo.xml	(revision 10a2ee5eb2c7193ffe448106010ca7be998a0671)
+++ gnome/core/libbonobo.xml	(revision ba4b31cf2cc877757bea0dcb5351b53b3449e103)
@@ -62,5 +62,5 @@
     <para><xref linkend="ORBit2"/>,
     <xref linkend="libxml2"/> and
-    <xref linkend="perl-modules"/>: XML Parser</para>
+    <xref linkend="perl-xml-parser"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: pst/sgml/docbook-utils.xml
===================================================================
--- pst/sgml/docbook-utils.xml	(revision 10a2ee5eb2c7193ffe448106010ca7be998a0671)
+++ pst/sgml/docbook-utils.xml	(revision ba4b31cf2cc877757bea0dcb5351b53b3449e103)
@@ -69,6 +69,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para><xref linkend="jadetex"/> (for conversion to DVI, PS and PDF),
-    <xref linkend="perl-modules"/>: SGMLSpm-&SGMLSpm-version; (for
-    conversion to man and texinfo), and
+    <xref linkend="perl-sgmlspm"/> (for conversion to man and texinfo), and
     <xref linkend="lynx"/> or <xref linkend="Links"/> or <xref linkend="w3m"/>
     (for conversion to ASCII text)</para>
Index: pst/typesetting/tex.xml
===================================================================
--- pst/typesetting/tex.xml	(revision 10a2ee5eb2c7193ffe448106010ca7be998a0671)
+++ pst/typesetting/tex.xml	(revision ba4b31cf2cc877757bea0dcb5351b53b3449e103)
@@ -121,8 +121,6 @@
     <para><xref linkend="libpng"/>,
     <xref linkend="x-installing"/>,
-    <!-- <xref linkend="openssl"/>,
-    <xref linkend="mysql"/>, -->
-    <xref linkend="perl-modules"/>: Tk-&Perl-Tk-version;, <ulink
-    url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.1.0.tar.gz">
+    <xref linkend="perl-tk"/>,
+    <ulink url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.1.0.tar.gz">
     t1lib</ulink>
     and <ulink url="http://www.boutell.com/gd/">GD</ulink></para>
Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision 10a2ee5eb2c7193ffe448106010ca7be998a0671)
+++ server/databases/postgresql.xml	(revision ba4b31cf2cc877757bea0dcb5351b53b3449e103)
@@ -75,5 +75,5 @@
     <xref linkend="docbook-dsssl"/>,
     <xref linkend="openjade"/>,
-    <xref linkend="perl-modules"/>: SGMLSpm-&SGMLSpm-version;,
+    <xref linkend="perl-sgmlspm"/>,
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
     <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>, and
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision 10a2ee5eb2c7193ffe448106010ca7be998a0671)
+++ server/major/bind.xml	(revision ba4b31cf2cc877757bea0dcb5351b53b3449e103)
@@ -63,10 +63,10 @@
     <bridgehead renderas="sect4">Optional (to Run the Test Suite)</bridgehead>
     <para><xref linkend="net-tools"/> (for <command>ifconfig</command>)
-    and <xref linkend="perl-modules"/>: Net-DNS</para>
+    and <xref linkend="perl-net-dns"/></para>
 
     <bridgehead renderas="sect4">Optional (to [Re]Build
     Documentation)</bridgehead>
     <para><xref linkend="openjade"/>,
-    <xref linkend="jadetex"/>,
+    <xref linkend="jadetex"/> and
     <xref linkend="docbook-dsssl"/></para>
 
Index: x/lib/shared-mime-info.xml
===================================================================
--- x/lib/shared-mime-info.xml	(revision 10a2ee5eb2c7193ffe448106010ca7be998a0671)
+++ x/lib/shared-mime-info.xml	(revision ba4b31cf2cc877757bea0dcb5351b53b3449e103)
@@ -62,5 +62,5 @@
     <para><xref linkend="glib2"/>,
     <xref linkend="libxml2"/> and
-    <xref linkend="perl-modules"/>: XML-Parser</para>
+    <xref linkend="perl-xml-parser"/></para>
 
   </sect2>
Index: xsoft/office/gimp.xml
===================================================================
--- xsoft/office/gimp.xml	(revision 10a2ee5eb2c7193ffe448106010ca7be998a0671)
+++ xsoft/office/gimp.xml	(revision ba4b31cf2cc877757bea0dcb5351b53b3449e103)
@@ -79,5 +79,5 @@
     <para><xref linkend="gtk2"/>,
     <xref linkend="libart_lgpl"/> and
-    <xref linkend="perl-modules"/>: XML-Parser</para>
+    <xref linkend="perl-xml-parser"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
