Index: gnome/add/gnome-media.xml
===================================================================
--- gnome/add/gnome-media.xml	(revision b3f41f60ad0f24d3e7f49ae24af7e5451bb431cb)
+++ gnome/add/gnome-media.xml	(revision 2f8e40ae5eb014173a17e7123ae8e71f51b22085)
@@ -7,7 +7,7 @@
   <!ENTITY gnome-media-download-http "&gnome-download-http;/gnome-media/&gnome-version;/gnome-media-&gnome-media-version;.tar.bz2">
   <!ENTITY gnome-media-download-ftp  "&gnome-download-ftp;/gnome-media/&gnome-version;/gnome-media-&gnome-media-version;.tar.bz2">
-  <!ENTITY gnome-media-md5sum        "74d9a78f7269602e033ab1a4a144afdf">
-  <!ENTITY gnome-media-size          "3.4 MB">
-  <!ENTITY gnome-media-buildsize     "39.2 MB">
+  <!ENTITY gnome-media-md5sum        "16c35916f429c5ea04fb942b4072643b">
+  <!ENTITY gnome-media-size          "2.9 MB">
+  <!ENTITY gnome-media-buildsize     "38.8 MB">
   <!ENTITY gnome-media-time          "0.8 SBU">
 ]>
@@ -61,10 +61,11 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="gst-plugins-base"/> (required for the
-    mixer and recorder to work)</para>
+    <para role="recommended"><xref linkend="gst-plugins-good"/> (required for
+    the mixer and recorder to work)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">An <xref linkend="server-mail"/> (that provides a
-    <command>sendmail</command> command) and
+    <para role="optional"><xref linkend="intltool"/>,
+    an <xref linkend="server-mail"/> (that provides a
+    <command>sendmail</command> command), and
     <xref linkend="docbook-utils"/></para>
 
@@ -80,9 +81,9 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --libexecdir=`pkg-config \
-            --variable=prefix ORBit-2.0`/lib/gnome-media \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib &amp;&amp;
+            --localstatedir=/var/lib \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/gnome-media &amp;&amp;
 make</userinput></screen>
 
@@ -99,17 +100,18 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/lib/gnome-media</parameter>: This switch puts libexec files in
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib/gnome-media</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
     <filename class="directory">$GNOME_PREFIX/lib/gnome-media</filename> instead
     of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
-    configuration files in <filename class="directory">&gnome-etc-dir;</filename>
-    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
-
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch
-    puts <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
   </sect2>
@@ -126,12 +128,8 @@
         <seg>CDDBSlave2, cddb-slave2-properties, cddb-track-editor,
         gnome-audio-profiles-properties, gnome-cd, gnome-sound-recorder,
-        gnome-volume-control, gstreamer-properties, and vumeter</seg>
-        <seg>libcddb-slave2.{so,a}, libgnome-media-profiles.{so,a},
-        libgnome-media-profiles.{so,a} libglade library, and
-        GNOME_Media_CDDBSlave2.server bonobo server</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{{,schemas/}apps/{CDDB-Slave2,
-        gnome-{cd, sound-recorder, volume-control}},
-        {,schemas/}system/gstreamer/audio}
-        and the following subdirectories of $GNOME_PREFIX/:
+        gnome-volume-control, gstreamer-properties and vumeter</seg>
+        <seg>libcddb-slave2.{so,a}, libgnome-media-profiles.{so,a} and
+        a libgnome-media-profiles.{so,a} Glade library</seg>
+        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
         include/{cddb-slave2,gnome-media},
         lib/gnome-media,
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision b3f41f60ad0f24d3e7f49ae24af7e5451bb431cb)
+++ introduction/welcome/changelog.xml	(revision 2f8e40ae5eb014173a17e7123ae8e71f51b22085)
@@ -46,6 +46,6 @@
       <itemizedlist>
         <listitem>
-          <para>[randy] - Updated the Nautilus CD Burner instructions to
-          conform with the GNOME 2.14.2 update.</para>
+          <para>[randy] - Updated the Nautilus CD Burner and GNOME Media
+          instructions to conform with the GNOME 2.14.2 update.</para>
         </listitem>
         <listitem>
