Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision 1ddb149ce93671ebc0d1106dce5eb69f723aa2f9)
+++ gnome/add/add.xml	(revision 53a02becf0d1064e833fffed7a743abeb3912c20)
@@ -11,16 +11,16 @@
 &yelp;
 &bug-buddy;
-&gnome-system-monitor;
-&gnome-utils;
-&gnome-games;
-<!-- &nautilus; -->
 &gedit;
 &eog;
 &acme;
 &ggv;
+<!-- &file-roller; -->
+&gnome-utils;
+&gnome-system-monitor;
 &gstreamer;
 &gst-plugins;
 &gnome-media;
 &nautilus-media;
+&gnome-games;
 &gnome2-user-docs;
 
Index: gnome/add/gst-plugins/gst-plugins-inst.xml
===================================================================
--- gnome/add/gst-plugins/gst-plugins-inst.xml	(revision 1ddb149ce93671ebc0d1106dce5eb69f723aa2f9)
+++ gnome/add/gst-plugins/gst-plugins-inst.xml	(revision 53a02becf0d1064e833fffed7a743abeb3912c20)
@@ -4,5 +4,5 @@
 <para>Install <application>gst-plugins</application> by running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
Index: gnome/add/gst-plugins/gst-plugins.ent
===================================================================
--- gnome/add/gst-plugins/gst-plugins.ent	(revision 1ddb149ce93671ebc0d1106dce5eb69f723aa2f9)
+++ gnome/add/gst-plugins/gst-plugins.ent	(revision 53a02becf0d1064e833fffed7a743abeb3912c20)
@@ -3,8 +3,8 @@
 <!ENTITY gst-plugins-inst SYSTEM "gst-plugins-inst.xml">
 <!ENTITY gst-plugins-desc SYSTEM "gst-plugins-desc.xml">
-<!ENTITY gst-plugins-version "0.6.2">
+<!ENTITY gst-plugins-version "0.6.4">
 <!ENTITY gst-plugins-download-http "http://ftp.gnome.org/pub/GNOME/sources/gst-plugins/0.6/gst-plugins-&gst-plugins-version;.tar.bz2">
 <!ENTITY gst-plugins-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gst-plugins/0.6/gst-plugins-&gst-plugins-version;.tar.bz2">
 <!ENTITY gst-plugins-size "1.9 MB">
-<!ENTITY gst-plugins-buildsize "102 MB">
+<!ENTITY gst-plugins-buildsize "108 MB">
 <!ENTITY gst-plugins-time "2.16 SBU">
Index: gnome/add/gstreamer/gstreamer-inst.xml
===================================================================
--- gnome/add/gstreamer/gstreamer-inst.xml	(revision 1ddb149ce93671ebc0d1106dce5eb69f723aa2f9)
+++ gnome/add/gstreamer/gstreamer-inst.xml	(revision 53a02becf0d1064e833fffed7a743abeb3912c20)
@@ -4,5 +4,6 @@
 <para>Install <application>GStreamer</application> by running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib  &amp;&amp;
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --localstatedir=/var/lib  &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
Index: gnome/add/gstreamer/gstreamer.ent
===================================================================
--- gnome/add/gstreamer/gstreamer.ent	(revision 1ddb149ce93671ebc0d1106dce5eb69f723aa2f9)
+++ gnome/add/gstreamer/gstreamer.ent	(revision 53a02becf0d1064e833fffed7a743abeb3912c20)
@@ -4,8 +4,8 @@
 <!ENTITY gstreamer-exp SYSTEM "gstreamer-exp.xml">
 <!ENTITY gstreamer-desc SYSTEM "gstreamer-desc.xml">
-<!ENTITY gstreamer-version "0.6.2">
+<!ENTITY gstreamer-version "0.6.4">
 <!ENTITY gstreamer-download-http "http://ftp.gnome.org/pub/GNOME/sources/gstreamer/0.6/gstreamer-&gstreamer-version;.tar.bz2">
 <!ENTITY gstreamer-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gstreamer/0.6/gstreamer-&gstreamer-version;.tar.bz2">
-<!ENTITY gstreamer-size "1.2 MB">
-<!ENTITY gstreamer-buildsize "72.7 MB">
+<!ENTITY gstreamer-size "1.1 MB">
+<!ENTITY gstreamer-buildsize "76.8 MB">
 <!ENTITY gstreamer-time "1.31 SBU">
Index: gnome/add/media/gnome-media-exp.xml
===================================================================
--- gnome/add/media/gnome-media-exp.xml	(revision 1ddb149ce93671ebc0d1106dce5eb69f723aa2f9)
+++ gnome/add/media/gnome-media-exp.xml	(revision 53a02becf0d1064e833fffed7a743abeb3912c20)
@@ -1,4 +1,9 @@
 <sect2>
 <title>Command explanations</title>
+
+<para><parameter>--libexecdir=`pkg-config --variable=prefix
+ORBit-2.0`/sbin</parameter>: This switch puts libexec files in
+<filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
+<filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
 <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
@@ -11,8 +16,4 @@
 instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-<para><parameter>--libexecdir=$GNOME_PREFIX/sbin</parameter>: This
-command puts libexec files in <filename class="directory">$GNOME_PREFIX/sbin</filename>
-instead of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
 </sect2>
 
Index: gnome/add/media/gnome-media-inst.xml
===================================================================
--- gnome/add/media/gnome-media-inst.xml	(revision 1ddb149ce93671ebc0d1106dce5eb69f723aa2f9)
+++ gnome/add/media/gnome-media-inst.xml	(revision 53a02becf0d1064e833fffed7a743abeb3912c20)
@@ -4,6 +4,7 @@
 <para>Install <application><acronym>GNOME</acronym> Media</application> by running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome \
---localstatedir=/var/lib --libexecdir=$GNOME_PREFIX/sbin &amp;&amp;
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \ 
+    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
+    --sysconfdir=/etc/gnome --localstatedir=/var/lib &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
Index: gnome/add/media/gnome-media-intro.xml
===================================================================
--- gnome/add/media/gnome-media-intro.xml	(revision 1ddb149ce93671ebc0d1106dce5eb69f723aa2f9)
+++ gnome/add/media/gnome-media-intro.xml	(revision 53a02becf0d1064e833fffed7a743abeb3912c20)
@@ -21,5 +21,6 @@
 <sect3><title><application><acronym>GNOME</acronym> Media</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="libgnomeui"/> and <xref linkend="gstreamer"/></para></sect4>
+<para><xref linkend="libgnomeui"/>, <xref linkend="gstreamer"/> and
+<xref linkend="gst-plugins"/></para></sect4>
 </sect3>
 
Index: gnome/add/media/gnome-media.ent
===================================================================
--- gnome/add/media/gnome-media.ent	(revision 1ddb149ce93671ebc0d1106dce5eb69f723aa2f9)
+++ gnome/add/media/gnome-media.ent	(revision 53a02becf0d1064e833fffed7a743abeb3912c20)
@@ -4,8 +4,8 @@
 <!ENTITY gnome-media-exp SYSTEM "gnome-media-exp.xml">
 <!ENTITY gnome-media-desc SYSTEM "gnome-media-desc.xml">
-<!ENTITY gnome-media-version "2.2.2">
-<!ENTITY gnome-media-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.2/gnome-media-&gnome-media-version;.tar.bz2">
-<!ENTITY gnome-media-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.2/gnome-media-&gnome-media-version;.tar.bz2">
-<!ENTITY gnome-media-size "2.8 MB">
-<!ENTITY gnome-media-buildsize "37.8 MB">
+<!ENTITY gnome-media-version "2.4.1.1">
+<!ENTITY gnome-media-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.4/gnome-media-&gnome-media-version;.tar.bz2">
+<!ENTITY gnome-media-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.4/gnome-media-&gnome-media-version;.tar.bz2">
+<!ENTITY gnome-media-size "2.7 MB">
+<!ENTITY gnome-media-buildsize "37.4 MB">
 <!ENTITY gnome-media-time "0.49 SBU">
Index: gnome/add/monitor/gnome-system-monitor-inst.xml
===================================================================
--- gnome/add/monitor/gnome-system-monitor-inst.xml	(revision 1ddb149ce93671ebc0d1106dce5eb69f723aa2f9)
+++ gnome/add/monitor/gnome-system-monitor-inst.xml	(revision 53a02becf0d1064e833fffed7a743abeb3912c20)
@@ -4,6 +4,6 @@
 <para>Install <application><acronym>GNOME</acronym> System Monitor</application> by running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib \
---sysconfdir=/etc/gnome &amp;&amp;
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \ 
+    --localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
Index: gnome/add/monitor/gnome-system-monitor.ent
===================================================================
--- gnome/add/monitor/gnome-system-monitor.ent	(revision 1ddb149ce93671ebc0d1106dce5eb69f723aa2f9)
+++ gnome/add/monitor/gnome-system-monitor.ent	(revision 53a02becf0d1064e833fffed7a743abeb3912c20)
@@ -4,8 +4,8 @@
 <!ENTITY gnome-system-monitor-exp SYSTEM "gnome-system-monitor-exp.xml">
 <!ENTITY gnome-system-monitor-desc SYSTEM "gnome-system-monitor-desc.xml">
-<!ENTITY gnome-system-monitor-version "2.0.5">
-<!ENTITY gnome-system-monitor-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.0/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
-<!ENTITY gnome-system-monitor-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.0/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
-<!ENTITY gnome-system-monitor-size "520 KB">
-<!ENTITY gnome-system-monitor-buildsize "8.5 MB">
+<!ENTITY gnome-system-monitor-version "2.4.0">
+<!ENTITY gnome-system-monitor-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.4/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
+<!ENTITY gnome-system-monitor-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.4/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
+<!ENTITY gnome-system-monitor-size "536 KB">
+<!ENTITY gnome-system-monitor-buildsize "8.7 MB">
 <!ENTITY gnome-system-monitor-time "0.12 SBU">
