Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision f244a43d64aba704044e6f9ed6fe3e4804a35733)
+++ gnome/add/add.xml	(revision 47b30a4caafb5cff8e34f3d1a7c7f91625a4cc44)
@@ -9,10 +9,10 @@
 &gnome-terminal;
 &gnome-applets;
+&yelp;
+&bug-buddy;
 &gnome-system-monitor;
 &gnome-utils;
 &gnome-games;
 <!-- &nautilus; -->
-&yelp;
-&bug-buddy;
 &gedit;
 &eog;
Index: gnome/add/yelp/yelp-exp.xml
===================================================================
--- gnome/add/yelp/yelp-exp.xml	(revision f244a43d64aba704044e6f9ed6fe3e4804a35733)
+++ gnome/add/yelp/yelp-exp.xml	(revision 47b30a4caafb5cff8e34f3d1a7c7f91625a4cc44)
@@ -2,6 +2,7 @@
 <title>Command explanations</title>
 
-<para><parameter>--libexecdir=$GNOME_PREFIX/sbin</parameter>: This switch puts
-libexec files in <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
+<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>
 
Index: gnome/add/yelp/yelp-inst.xml
===================================================================
--- gnome/add/yelp/yelp-inst.xml	(revision f244a43d64aba704044e6f9ed6fe3e4804a35733)
+++ gnome/add/yelp/yelp-inst.xml	(revision 47b30a4caafb5cff8e34f3d1a7c7f91625a4cc44)
@@ -4,5 +4,6 @@
 <para>Install <application>Yelp</application> by running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --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 &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
Index: gnome/add/yelp/yelp.ent
===================================================================
--- gnome/add/yelp/yelp.ent	(revision f244a43d64aba704044e6f9ed6fe3e4804a35733)
+++ gnome/add/yelp/yelp.ent	(revision 47b30a4caafb5cff8e34f3d1a7c7f91625a4cc44)
@@ -4,8 +4,8 @@
 <!ENTITY yelp-exp SYSTEM "yelp-exp.xml">
 <!ENTITY yelp-desc SYSTEM "yelp-desc.xml">
-<!ENTITY yelp-version "2.2.3">
-<!ENTITY yelp-download-http "http://ftp.gnome.org/pub/GNOME/sources/yelp/2.2/yelp-&yelp-version;.tar.bz2">
-<!ENTITY yelp-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.2/yelp-&yelp-version;.tar.bz2">
-<!ENTITY yelp-size "516 KB">
-<!ENTITY yelp-buildsize "11.9 MB">
+<!ENTITY yelp-version "2.4.1">
+<!ENTITY yelp-download-http "http://ftp.gnome.org/pub/GNOME/sources/yelp/2.4/yelp-&yelp-version;.tar.bz2">
+<!ENTITY yelp-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.4/yelp-&yelp-version;.tar.bz2">
+<!ENTITY yelp-size "612 KB">
+<!ENTITY yelp-buildsize "11.7 MB">
 <!ENTITY yelp-time "0.16 SBU">
Index: gnome/lib/libgtkhtml/libgtkhtml-inst.xml
===================================================================
--- gnome/lib/libgtkhtml/libgtkhtml-inst.xml	(revision f244a43d64aba704044e6f9ed6fe3e4804a35733)
+++ gnome/lib/libgtkhtml/libgtkhtml-inst.xml	(revision 47b30a4caafb5cff8e34f3d1a7c7f91625a4cc44)
@@ -4,5 +4,5 @@
 <para>Install <application>libgtkhtml</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</command></userinput></screen>
Index: gnome/lib/libgtkhtml/libgtkhtml.ent
===================================================================
--- gnome/lib/libgtkhtml/libgtkhtml.ent	(revision f244a43d64aba704044e6f9ed6fe3e4804a35733)
+++ gnome/lib/libgtkhtml/libgtkhtml.ent	(revision 47b30a4caafb5cff8e34f3d1a7c7f91625a4cc44)
@@ -3,8 +3,8 @@
 <!ENTITY libgtkhtml-inst SYSTEM "libgtkhtml-inst.xml">
 <!ENTITY libgtkhtml-desc SYSTEM "libgtkhtml-desc.xml">
-<!ENTITY libgtkhtml-version "2.2.4">
-<!ENTITY libgtkhtml-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgtkhtml/2.2/libgtkhtml-&libgtkhtml-version;.tar.bz2">
-<!ENTITY libgtkhtml-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgtkhtml/2.2/libgtkhtml-&libgtkhtml-version;.tar.bz2">
-<!ENTITY libgtkhtml-size "336 KB">
-<!ENTITY libgtkhtml-buildsize "129 MB">
+<!ENTITY libgtkhtml-version "2.4.1">
+<!ENTITY libgtkhtml-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgtkhtml/2.4/libgtkhtml-&libgtkhtml-version;.tar.bz2">
+<!ENTITY libgtkhtml-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgtkhtml/2.4/libgtkhtml-&libgtkhtml-version;.tar.bz2">
+<!ENTITY libgtkhtml-size "400 KB">
+<!ENTITY libgtkhtml-buildsize "131 MB">
 <!ENTITY libgtkhtml-time "1.40 SBU">
