Index: gnome/add/nautilus-cd-burner.xml
===================================================================
--- gnome/add/nautilus-cd-burner.xml	(revision f191d88a9ecd6d3a2befd36c63ad76ac1b12170a)
+++ gnome/add/nautilus-cd-burner.xml	(revision 7d6b8fe8ceb68cea2f98cac460820723f9ca8b09)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY nautilus-cd-burner-download-http "http://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/&gnome-version;/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
-  <!ENTITY nautilus-cd-burner-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/&gnome-version;/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
-  <!ENTITY nautilus-cd-burner-md5sum        "6fb90feb52340627d4b93a1127654a00">
-  <!ENTITY nautilus-cd-burner-size          "614 KB">
-  <!ENTITY nautilus-cd-burner-buildsize     "9.8 MB">
+  <!ENTITY nautilus-cd-burner-download-http "&gnome-download-http;/nautilus-cd-burner/&gnome-version;/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
+  <!ENTITY nautilus-cd-burner-download-ftp  "&gnome-download-http;/nautilus-cd-burner/&gnome-version;/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
+  <!ENTITY nautilus-cd-burner-md5sum        "46c793c4f381608297cdd7e2fac1ad72">
+  <!ENTITY nautilus-cd-burner-size          "609 KB">
+  <!ENTITY nautilus-cd-burner-buildsize     "9.9 MB">
   <!ENTITY nautilus-cd-burner-time          "0.2 SBU">
 ]>
@@ -71,4 +71,10 @@
     <para role="optional"><xref linkend="hal"/></para>
 
+    <para>Though <application>Nautilus CD Burner</application> happily passes
+    all the <command>configure</command> script checks and then builds
+    successfully without it, the <xref linkend="cdrtools"/> package is required
+    to be installed or you won't be able to create ISO filesystems or burn
+    CDs.</para>
+
   </sect2>
 
@@ -80,6 +86,7 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
-    --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --libexecdir=`pkg-config \
+            --variable=prefix ORBit-2.0`/lib/nautilus-cd-burner \
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -96,6 +103,8 @@
 
     <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
+    ORBit-2.0`/lib/nautilus-cd-burner</parameter>: This switch puts libexec
+    files in
+    <filename class="directory">$GNOME_PREFIX/lib/nautilus-cd-burner</filename>
+    instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
@@ -115,5 +124,5 @@
 
       <seglistitem>
-        <seg>mapping-daemon and nautilus-cd-burner</seg>
+        <seg>nautilus-cd-burner</seg>
         <seg>libnautilus-burn.so and gnome-vfs and nautilus modules</seg>
         <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/apps/nautilus-cd-burner,
@@ -128,14 +137,4 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mapping-daemon">
-        <term><command>mapping-daemon</command></term>
-        <listitem>
-          <para>is the central daemon which keeps track of file mappings.</para>
-          <indexterm zone="nautilus-cd-burner mapping-daemon">
-            <primary sortas="b-mapping-daemon">mapping-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
       <varlistentry id="nautilus-cd-burner-prog">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f191d88a9ecd6d3a2befd36c63ad76ac1b12170a)
+++ introduction/welcome/changelog.xml	(revision 7d6b8fe8ceb68cea2f98cac460820723f9ca8b09)
@@ -49,6 +49,6 @@
           instructions to fit the 2.12.2 version changes: libgnomecups,
           libgnomeprint, libgnomeprintui, libgtkhtml, Evolution Data Server,
-          system-tools-backends, EOG, gucharmap, File Roller,
-          Gnome Utilities.</para>
+          system-tools-backends, EOG, gucharmap, File Roller, Gnome Utilities,
+          Nautilus CD Burner.</para>
         </listitem>
         <listitem>
