diff --git a/multimedia/audioutils/vorbistools/vorbistools-desc.xml b/multimedia/audioutils/vorbistools/vorbistools-desc.xml
index b5470806a5..2a57ef3001 100644
--- a/multimedia/audioutils/vorbistools/vorbistools-desc.xml
+++ b/multimedia/audioutils/vorbistools/vorbistools-desc.xml
@@ -13,13 +13,13 @@
 
 <sect3><title>oggdec</title>
 <para><command>oggdec</command> is a simple decoder which converts Ogg Vorbis 
-file into <acronym>PCM</acronym> audio files (<filename>WAV</filename> or
-<filename>RAW</filename>).</para></sect3>
+file into <acronym>PCM</acronym> audio files (<acronym>WAV</acronym> or
+raw).</para></sect3>
 
 <sect3><title>oggenc</title>
-<para><command>oggenc</command> is the encoder that turns
-<filename>RAW</filename>, <filename>WAV</filename> or <filename>AIFF
-</filename> files into an Ogg Vorbis stream.</para></sect3>
+<para><command>oggenc</command> is the encoder that turns raw,
+<acronym>WAV</acronym> or <acronym>AIFF</acronym> files into an Ogg
+Vorbis stream.</para></sect3>
 
 <sect3><title>ogg123</title>
 <para><command>ogg123</command> is a command-line audio player for Ogg Vorbis 
diff --git a/multimedia/audioutils/vorbistools/vorbistools-intro.xml b/multimedia/audioutils/vorbistools/vorbistools-intro.xml
index ce63ce125f..c1e1f5d120 100644
--- a/multimedia/audioutils/vorbistools/vorbistools-intro.xml
+++ b/multimedia/audioutils/vorbistools/vorbistools-intro.xml
@@ -2,7 +2,7 @@
 <title>Introduction to <application>Vorbis Tools</application></title>
 
 <para>The <application>Vorbis Tools</application> package contains command-line 
-tools for <filename>OGG</filename> audio files.  This is useful for encoding, 
+tools for Ogg audio files.  This is useful for encoding, 
 playing or editing files using the Ogg <acronym>CODEC</acronym>.</para>
 
 <sect3><title>Package information</title>
@@ -20,12 +20,12 @@ url="&vorbistools-download-ftp;"/></para></listitem>
                                                                                 
 <sect3><title><application>Vorbis Tools</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="curl"/>, <xref linkend="libao"/>, <xref
-linkend="libogg"/> and <xref linkend="libvorbis"/></para></sect4>
+<para><xref linkend="libvorbis"/></para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="speex"/></para></sect4>
+<para><xref linkend="curl"/>, <xref linkend="libao"/>,
+<xref linkend="flac"/> and <xref linkend="speex"/>
+</para></sect4>
 
 </sect3>
 
-
 </sect2>
diff --git a/multimedia/audioutils/vorbistools/vorbistools.ent b/multimedia/audioutils/vorbistools/vorbistools.ent
index 38c6e4bac1..c338e45df8 100644
--- a/multimedia/audioutils/vorbistools/vorbistools.ent
+++ b/multimedia/audioutils/vorbistools/vorbistools.ent
@@ -4,7 +4,7 @@
 <!ENTITY vorbistools-desc SYSTEM "vorbistools-desc.xml">
 <!ENTITY vorbistools-version "1.0.1">
 <!ENTITY vorbistools-download-http "http://www.vorbis.com/files/1.0.1/unix/vorbis-tools-&vorbistools-version;.tar.gz">
-<!ENTITY vorbistools-download-ftp "ftp://ftp.yars.free.net/pub/software/unix/util/sound/ogg/vorbis-tools-&vorbistools-version;.tar.gz">
-<!ENTITY vorbistools-size "416 KB">
+<!ENTITY vorbistools-download-ftp "ftp://ftp.jg555.com/pub/linux/mm/vorbis-tools-&vorbistools-version;.tar.gz">
+<!ENTITY vorbistools-size "701 KB">
 <!ENTITY vorbistools-buildsize "4.4 MB">
 <!ENTITY vorbistools-time "0.12 SBU">
diff --git a/multimedia/libdriv/libogg/libogg-desc.xml b/multimedia/libdriv/libogg/libogg-desc.xml
index aac1191947..0f068e72a5 100644
--- a/multimedia/libdriv/libogg/libogg-desc.xml
+++ b/multimedia/libdriv/libogg/libogg-desc.xml
@@ -10,10 +10,8 @@ class="libraryfile">libogg</filename> libraries.</para>
 
 <sect3><title>ogg libraries</title>
 <para><filename class="libraryfile">libogg</filename> libraries provide the 
-functions for programs wishing to read or write <filename>OGG</filename> 
+functions for programs wishing to read or write Ogg
 formatted bit streams.</para>
 </sect3>
 
-
 </sect2>
-