Index: multimedia/audioutils/mpg123/mpg123-desc.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-desc.xml	(revision 57050d0c74f8b51c3a99deed6348d9770c7e7b7f)
+++ multimedia/audioutils/mpg123/mpg123-desc.xml	(revision 6b012d98b66304beccaa3c6a90b075c4edcb6606)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The mpg123 package contains <userinput>mpg123</userinput>.</para>
+<para>The <application>mpg123</application> package contains <command>mpg123
+</command>.</para>
 
 </sect2>
@@ -9,5 +10,6 @@
 
 <sect3><title>mpg123</title>
-<para>mpg123 is used for playing mp3 files via the console.</para></sect3>
+<para><command>mpg123</command> is used for playing mp3 files via the console.
+</para></sect3>
 
 </sect2>
Index: multimedia/audioutils/mpg123/mpg123-exp.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-exp.xml	(revision 57050d0c74f8b51c3a99deed6348d9770c7e7b7f)
+++ multimedia/audioutils/mpg123/mpg123-exp.xml	(revision 6b012d98b66304beccaa3c6a90b075c4edcb6606)
@@ -2,10 +2,9 @@
 <title>Command explanations</title>
 
-<para><userinput>make linux</userinput> : This command builds 
-mpg123 for linux.</para>
-<para><userinput>make linux-help</userinput> : This command lists 
-all build-options for mpg123.</para>
-<para><userinput>make install</userinput> : This command installs 
-mpg123 in <filename>/usr/local/bin</filename>.</para>
+<para><command>make linux</command> : This command builds 
+<application>mpg123</application> for Linux.</para>
+
+<para><command>make linux-help</command> : This command lists 
+all build-options for <application>mpg123</application>.</para>
 
 </sect2>
Index: multimedia/audioutils/mpg123/mpg123-inst.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-inst.xml	(revision 57050d0c74f8b51c3a99deed6348d9770c7e7b7f)
+++ multimedia/audioutils/mpg123/mpg123-inst.xml	(revision 6b012d98b66304beccaa3c6a90b075c4edcb6606)
@@ -1,18 +1,11 @@
 <sect2>
-<title>Installation of mpg123</title>
+<title>Installation of <application>mpg123</application></title>
 
-<para>Install mpg123 by running the following commands:</para>
+<para>Install <application>mpg123</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>make PREFIX=/usr linux &amp;&amp;</userinput>
-<userinput>make PREFIX=/usr install</userinput></screen></para>
+<screen><userinput><command>make PREFIX=/usr linux &amp;&amp;
+make PREFIX=/usr install</command></userinput></screen>
 
-<para>You can optimize the build of mpg123 for your processor. 
-To do this, type</para>
-<para><screen><userinput>make linux-help</userinput></screen></para>
-
-<para>and select the optimization appropriate for your machine.
-However, this may not always work.  There have been problems reported
-with using optimizations with mpg123; make PREFIX=/usr linux always
-seems to work.</para>
 
 </sect2>
Index: multimedia/audioutils/mpg123/mpg123-intro.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-intro.xml	(revision 57050d0c74f8b51c3a99deed6348d9770c7e7b7f)
+++ multimedia/audioutils/mpg123/mpg123-intro.xml	(revision 6b012d98b66304beccaa3c6a90b075c4edcb6606)
@@ -1,16 +1,26 @@
 <sect2>
-<title>Introduction to mpg123</title>
+<title>Introduction to <application>mpg123</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&mpg123-download-http;"/>
-Download location (FTP):        <ulink url="&mpg123-download-ftp;"/>
-Version used:                   &mpg123-version;
-Package size:                   &mpg123-size;
-Estimated Disk space required:  &mpg123-buildsize;</screen>
+<para>The <application>mpg123</application> package contains a console-based 
+mp3 player. It claims to be the fastest mp3 decoder for unix.</para>
 
-<para>The mpg123 package contains a console-based mp3-player. It claims to 
-be the fastest mp3-decoder for unix.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&mpg123-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&mpg123-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &mpg123-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&mpg123-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&mpg123-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>mpg123</application> dependencies</title>
+<sect4><title>Required</title>
+<para>oss or <xref linkend="alsa-oss"/></para></sect4>
+</sect3>
 
-<screen>mpg123 depends on:
-oss or <xref linkend="alsa-oss"/></screen>
 
 </sect2>
