diff --git a/general.ent b/general.ent
index c0713533e2..9e666ca8a6 100644
--- a/general.ent
+++ b/general.ent
@@ -445,7 +445,7 @@
 <!ENTITY gnome-volume-manager-version "1.5.4">
 <!ENTITY gnome-games-version          "2.12.2">
 <!ENTITY sound-juicer-version         "2.12.3">
-<!ENTITY totem-version                "1.2.0">
+<!ENTITY totem-version                "1.2.1">
 <!ENTITY gdm-version                  "2.8.0.7">
 
 <!-- Accessibility -->
diff --git a/gnome/add/totem.xml b/gnome/add/totem.xml
index 580541f3b6..4db6461237 100644
--- a/gnome/add/totem.xml
+++ b/gnome/add/totem.xml
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY totem-download-http "http://ftp.gnome.org/pub/GNOME/sources/totem/1.2/totem-&totem-version;.tar.bz2">
-  <!ENTITY totem-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/totem/1.2/totem-&totem-version;.tar.bz2">
-  <!ENTITY totem-md5sum        "e07aded62a929779a4cd28c16fdb2efd">
-  <!ENTITY totem-size          "1.7 MB">
-  <!ENTITY totem-buildsize     "26.9 MB">
+  <!ENTITY totem-download-http "&gnome-download-http;/totem/1.2/totem-&totem-version;.tar.bz2">
+  <!ENTITY totem-download-ftp  "&gnome-download-ftp;/totem/1.2/totem-&totem-version;.tar.bz2">
+  <!ENTITY totem-md5sum        "7915469973500dba01d51edfd9e49cf3">
+  <!ENTITY totem-size          "1.4 MB">
+  <!ENTITY totem-buildsize     "27.6 MB">
   <!ENTITY totem-time          "0.6 SBU">
 ]>
 
@@ -71,7 +71,7 @@
     <para role="required"><xref linkend="gnome-icon-theme"/>,
     <xref linkend="gnome-desktop"/>,
     <xref linkend="iso-codes"/>,
-    <xref linkend="libmusicbrainz"/> and
+    <xref linkend="libmusicbrainz"/>, and
     <xref linkend="xine-lib"/> (default back-end) or
     <xref linkend="gst-plugins"/> (and <ulink
     url="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html">
@@ -79,12 +79,12 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="nautilus"/>,
-    <xref linkend="mozilla"/> or <xref linkend="firefox"/> (to build
-    the browser plug-in, requires <xref linkend="dbus"/> also),
+    <xref linkend="mozilla"/> or <xref linkend="firefox"/>
+    (to build the browser plug-in, requires <xref linkend="dbus"/> also),
     <ulink url="http://www.evation.com/libirman/libirman.html">libirman</ulink>,
     <ulink url="http://www.lirc.org">LIRC</ulink>,
     <ulink url="http://www.home.unix-ag.org/simon/gromit/">Gromit</ulink>
-    (required for the telestrator mode) and
+    (required for the telestrator mode), and
     <ulink url="http://sourceforge.net/projects/nv-tv-out/">NvTv Simple</ulink></para>
 
     <para>Note: <xref linkend="libdvdcss"/> is a run-time requirement if you
@@ -99,8 +99,10 @@
     commands:</para>
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/lib/totem \
-    --localstatedir=/var/lib --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --libexecdir=`pkg-config \
+            --variable=prefix ORBit-2.0`/lib/totem \
+            --localstatedir=/var/lib \
+            --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -155,21 +157,12 @@ make</userinput></screen>
         <seg>libtotem-plparser.[so,a], a <application>Nautilus</application>
         extension plugin and optionally, a <application>Mozilla</application>
         video plugin</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/apps/totem,
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/[many
-        directories],
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/[many
-        directories],
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/schemas/apps/totem,
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/[many
-        directories],
-        &gnome-etc-dir;/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/[many
-        directories],
-        $GNOME_PREFIX/include/totem,
-        $GNOME_PREFIX/lib/totem,
-        $GNOME_PREFIX/share/gnome/help/totem,
-        $GNOME_PREFIX/share/omf/totem and
-        $GNOME_PREFIX/share/totem</seg>
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/[[,schemas/]apps/totem,
+        [,schemas/]desktop/gnome/[thumbnailers, url-handlers]/[too many to list]]
+        and the following subdirectories of $GNOME_PREFIX/:
+        include/totem,
+        lib/totem,
+        share/[,gnome/help/, omf/]totem</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 3302a068e3..09cfdca818 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>February 8th, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to Totem-1.2.1.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated to Gnumeric-1.6.2.</para>
         </listitem>