Index: general.ent
===================================================================
--- general.ent	(revision 675575a9c8387d04e40dbb3662ab4490bd7a71c7)
+++ general.ent	(revision e036353921e62cf156ce8b1873e3a8ee7524278c)
@@ -873,5 +873,5 @@
 <!ENTITY gstreamer-version            "0.10.25">
 <!ENTITY gst-plugins-base-version     "0.10.35">
-<!ENTITY gst-plugins-good-version     "0.10.17">
+<!ENTITY gst-plugins-good-version     "0.10.30">
 <!ENTITY gst-plugins-bad-version      "0.10.21">
 <!ENTITY gst-plugins-ugly-version     "0.10.10">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 675575a9c8387d04e40dbb3662ab4490bd7a71c7)
+++ introduction/welcome/changelog.xml	(revision e036353921e62cf156ce8b1873e3a8ee7524278c)
@@ -49,5 +49,5 @@
         </listitem>
         <listitem>
-          <para>[ken] - Merge gst-plugins-base-0.10.35 from Wayne.</para>
+          <para>[ken] - Merge gst-plugins-base-0.10.35 and gst-plugins-good-0.10.30 from Wayne.</para>
         </listitem>
       </itemizedlist>
Index: multimedia/libdriv/gst-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst-plugins-good.xml	(revision 675575a9c8387d04e40dbb3662ab4490bd7a71c7)
+++ multimedia/libdriv/gst-plugins-good.xml	(revision e036353921e62cf156ce8b1873e3a8ee7524278c)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gst-plugins-good-download-http "&gnome-download-http;/gst-plugins-good/0.10/gst-plugins-good-&gst-plugins-good-version;.tar.bz2">
-  <!ENTITY gst-plugins-good-download-ftp "&gnome-download-ftp;/gst-plugins-good/0.10/gst-plugins-good-&gst-plugins-good-version;.tar.bz2">
-  <!ENTITY gst-plugins-good-md5sum        "833546cd2b8bbf86b8ed083b00897918">
-  <!ENTITY gst-plugins-good-size          "2.5 MB">
-  <!ENTITY gst-plugins-good-buildsize     "82 MB">
-  <!ENTITY gst-plugins-good-time          "2.2 SBU">
+  <!ENTITY gst-plugins-good-download-http "&gnome-download-http;/gst-plugins-good/0.10/gst-plugins-good-&gst-plugins-good-version;.tar.xz">
+  <!ENTITY gst-plugins-good-download-ftp "&gnome-download-ftp;/gst-plugins-good/0.10/gst-plugins-good-&gst-plugins-good-version;.tar.xz">
+  <!ENTITY gst-plugins-good-md5sum        "bb9c03d950fe2f9d9392d1b47457440c">
+  <!ENTITY gst-plugins-good-size          "2.7 MB">
+  <!ENTITY gst-plugins-good-buildsize     "114 MB">
+  <!ENTITY gst-plugins-good-time          "1.2 SBU">
 ]>
 
@@ -36,9 +36,9 @@
     (LGPL for the plug-in code, LGPL or LGPL-compatible for the supporting
     library). A wide range of video and audio decoders, encoders, and filters
-    are included. Also see the <xref linkend="gst-plugins-ugly"/>, <ulink
-    url="http://gstreamer.freedesktop.org/modules/gst-plugins-bad.html">
-    GStreamer Bad Plug-ins</ulink> and <ulink
-    url="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html">GStreamer
-    FFmpeg plug-in</ulink> packages.</para>
+    are included. Also see the <xref linkend="gst-plugins-ugly"/>, <xref
+    linkend="gst-plugins-bad"/>  and <xref linkend="gst-ffmpeg"/> packages.
+    </para>
+
+    &lfs70_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -94,5 +94,5 @@
     <ulink url="http://freshmeat.net/projects/libv4l">libv4l</ulink>,
     <ulink url="http://www.oberhumer.com/opensource/lzo/">lzo</ulink>,
-    <ulink url="http://pulseaudio.org/">PulseAudio</ulink>,
+    <xref linkend="pulseaudio"/>,
     <xref linkend="speex"/>,
     <xref linkend="udev"/> (gudev),
@@ -128,5 +128,5 @@
 
 <screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --sysconfdir=/etc --with-gtk=3.0 &amp;&amp;
 make</userinput></screen>
 
@@ -153,9 +153,9 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This parameter
+    <para><parameter>--sysconfdir=$GNOME_SYSCONFDIR</parameter>: This parameter
     is used so that the <application>GConf</application> configuration files
     are installed in the system-wide GNOME <application>GConf</application>
     database located in
-    <filename class="directory">&gnome-etc-dir;/gconf</filename>
+    <filename class="directory">$GNOME_SYSCONFDIR/gconf</filename>
     instead of <filename class="directory">/usr/etc</filename>. You may omit
     this parameter if you don't have <application>GConf</application>
