diff --git a/gnome/lib/libgnome/libgnome-intro.xml b/gnome/lib/libgnome/libgnome-intro.xml
index 803ba8e744..ce5dbe0a37 100644
--- a/gnome/lib/libgnome/libgnome-intro.xml
+++ b/gnome/lib/libgnome/libgnome-intro.xml
@@ -19,9 +19,14 @@ url="&libgnome-download-ftp;"/></para></listitem>
 
 <sect3><title><application>libgnome</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="esound"/> and <xref linkend="gnome-vfs"/></para></sect4>
+<para>
+<xref linkend="gnome-vfs"/>
+</para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="gtk-doc"/> and <xref linkend="DocBook"/></para></sect4>
+<para>
+<xref linkend="esound"/> and
+<xref linkend="gtk-doc"/>
+</para></sect4>
 </sect3>
 
 </sect2>
diff --git a/kde/inst/kde-base.xml b/kde/inst/kde-base.xml
index 6c6ac719d3..9d4fb80fd0 100644
--- a/kde/inst/kde-base.xml
+++ b/kde/inst/kde-base.xml
@@ -23,8 +23,6 @@ and libraries.</para>
 <sect4><title>Optional</title>
 <para>
 <xref linkend="libxml2"/>,
-<xref linkend="samba"/>, <!-- Point to 3.0 if Billy doesn't update
-                              before next release. -->
 <xref linkend="j2sdk"/>,
 <xref linkend="lesstif"/>,
 <xref linkend="openssl"/>,
@@ -33,6 +31,7 @@ and libraries.</para>
 <xref linkend="openldap"/>,
 <xref linkend="pkgconfig"/>,
 <xref linkend="libart_lgpl"/>,
+<ulink url="http://www.samba.org/">Samba 3.0.<replaceable>X</replaceable></ulink>,
 <ulink url="http://mtools.linux.lu/">Mtools</ulink>,
 <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
 <ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
diff --git a/multimedia/libdriv/esound/esound-intro.xml b/multimedia/libdriv/esound/esound-intro.xml
index bea018b239..9971ef9f90 100644
--- a/multimedia/libdriv/esound/esound-intro.xml
+++ b/multimedia/libdriv/esound/esound-intro.xml
@@ -16,7 +16,15 @@ playback by a single device.</para>
 
 <sect3><title><application>EsounD</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="audiofile"/></para></sect4>
+<para>
+<xref linkend="audiofile"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="alsa"/>,
+<xref linkend="tcpwrappers"/> and
+<ulink url="http://sources.redhat.com/docbook-tools/">docbook-utils</ulink>
+</para></sect4>
 </sect3>
 
 </sect2>