Index: general.ent
===================================================================
--- general.ent	(revision 709533382788f0e23bb81799ea00e4d266c62d8f)
+++ general.ent	(revision ac0aa6f6c7f83c7b7d595f6028cae17877829045)
@@ -554,5 +554,5 @@
 <!-- Chapter 40 -->
 <!ENTITY cdrtools-version             "2.01">
-<!ENTITY cdrdao-version               "1.2.0">
+<!ENTITY cdrdao-version               "1.2.1">
 <!ENTITY udftools-version             "1.0.0b3">
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 709533382788f0e23bb81799ea00e4d266c62d8f)
+++ introduction/welcome/changelog.xml	(revision ac0aa6f6c7f83c7b7d595f6028cae17877829045)
@@ -45,4 +45,7 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Updated to Cdrdao-1.2.1.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Updated vim to version 6.4.</para>
         </listitem>
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision 709533382788f0e23bb81799ea00e4d266c62d8f)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision ac0aa6f6c7f83c7b7d595f6028cae17877829045)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY cdrdao-download-http "http://prdownloads.sourceforge.net/cdrdao/cdrdao-&cdrdao-version;.tar.gz">
+  <!ENTITY cdrdao-download-http "http://prdownloads.sourceforge.net/cdrdao/cdrdao-&cdrdao-version;.tar.bz2">
   <!ENTITY cdrdao-download-ftp  " ">
   <!ENTITY cdrdao-md5sum        "dc2bdef7a7c8973e678ba4a4a2d9cc7e">
-  <!ENTITY cdrdao-size          "2.0 MB">
-  <!ENTITY cdrdao-buildsize     "64 MB">
-  <!ENTITY cdrdao-time          "1.5 SBU (includes building <command>gcdmaster</command>)">
+  <!ENTITY cdrdao-size          "1.3 MB">
+  <!ENTITY cdrdao-buildsize     "60.8 MB">
+  <!ENTITY cdrdao-time          "1.4 SBU (includes building <command>gcdmaster</command>)">
 ]>
 
@@ -72,6 +72,14 @@
     <command>gcdmaster</command> Program)</bridgehead>
 
-    <para><emphasis>Note: all the following packages must be built in
-    the order listed.</emphasis></para>
+    <para><emphasis>Note: the following packages must be built in
+    the order listed. Use the current <quote>stable</quote> version of
+    each package.</emphasis></para>
+
+    <!-- The following is really old. pkgconfig has been updated
+         two or three times since this was written. It probably
+         isn't applicable any longer. Delete this comment and
+         the entire note if next time during an update things 
+         haven't changed. I can't see this being required any
+         longer. -Randy
 
     <note>
@@ -90,15 +98,16 @@
     </note>
 
+    -->
 
     <para role="optional"><xref linkend="libgnomeui"/>,
-    <ulink url="http://libsigc.sourceforge.net/">libsigc++-2.0.13</ulink>,
-    <ulink url="http://www.gtkmm.org/">glibmm-2.6.1</ulink>,
-    <ulink url="http://www.gtkmm.org/">gtkmm-2.6.3</ulink>,
-    <ulink url="http://www.gtkmm.org/">libglademm-2.6.0</ulink>,
-    <ulink url="http://www.gtkmm.org/">libgnomecanvasmm-2.10.0</ulink>,
-    <ulink url="http://www.gtkmm.org/">gconfmm-2.10.0</ulink>,
-    <ulink url="http://www.gtkmm.org/">libgnomemm-2.10.0</ulink>,
-    <ulink url="http://www.gtkmm.org/">gnome-vfsmm-2.10.0</ulink> and
-    <ulink url="http://www.gtkmm.org/">libgnomeuimm-2.10.0</ulink></para>
+    <ulink url="http://libsigc.sourceforge.net/">libsigc++</ulink>,
+    <ulink url="http://www.gtkmm.org/">glibmm</ulink>,
+    <ulink url="http://www.gtkmm.org/">gtkmm</ulink>,
+    <ulink url="http://www.gtkmm.org/">libglademm</ulink>,
+    <ulink url="http://www.gtkmm.org/">libgnomecanvasmm</ulink>,
+    <ulink url="http://www.gtkmm.org/">gconfmm</ulink>,
+    <ulink url="http://www.gtkmm.org/">gnome-vfsmm</ulink>,
+    <ulink url="http://www.gtkmm.org/">libgnomemm</ulink>, and
+    <ulink url="http://www.gtkmm.org/">libgnomeuimm</ulink></para>
 
   </sect2>
@@ -110,21 +119,14 @@
     commands:</para>
 
-<screen><userinput>sed -i 's:Toc.h":&amp;\nclass Toc;:' \
-    trackdb/FormatConverter.h trackdb/CueParser.cc &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
+    <para>This package does not come with a test suite.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i 's:Toc.h":&amp;\nclass Toc;:'
-    trackdb/FormatConverter.h trackdb/CueParser.cc</command>:
-    This command adds forward class declarations required by gcc-4.0.x.</para>
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m755 -d /usr/share/doc/cdrdao-&cdrdao-version; &amp;&amp;
+install -v -m644 README* /usr/share/doc/cdrdao-&cdrdao-version;</userinput></screen>
 
   </sect2>
@@ -142,5 +144,6 @@
         toc2mp3</seg>
         <seg>None</seg>
-        <seg>/usr/share/cdrdao</seg>
+        <seg>/usr/share/cdrdao, /usr/share/doc/cdrdao-&cdrdao-version;
+        and /usr/share/gcdmaster</seg>
       </seglistitem>
     </segmentedlist>
@@ -220,3 +223,2 @@
 
 </sect1>
-
