diff --git a/general.ent b/general.ent
index 144d0a1ba7..b753b908d6 100644
--- a/general.ent
+++ b/general.ent
@@ -391,7 +391,7 @@
 <!ENTITY gal-version                  "2.4.3">
 <!ENTITY gtkhtml-version              "3.8.1">
 <!ENTITY libgtkhtml-version           "2.6.3">
-<!ENTITY evolution-data-server-version "1.4.1">
+<!ENTITY evolution-data-server-version "1.4.1.1">
 <!ENTITY bug-buddy-version            "2.12.1">
 <!ENTITY gtksourceview-version        "1.4.2">
 <!ENTITY gedit-version                "2.12.1">
diff --git a/gnome/add/evolution-data-server.xml b/gnome/add/evolution-data-server.xml
index d92414b448..0a8254e48a 100644
--- a/gnome/add/evolution-data-server.xml
+++ b/gnome/add/evolution-data-server.xml
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY evolution-data-server-download-http "http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.2/evolution-data-server-&evolution-data-server-version;.tar.bz2">
-  <!ENTITY evolution-data-server-download-ftp  "ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.2/evolution-data-server-&evolution-data-server-version;.tar.bz2">
-  <!ENTITY evolution-data-server-md5sum        "2b15cba799e4594926472dca3e1747bb">
-  <!ENTITY evolution-data-server-size          "7.5 MB">
-  <!ENTITY evolution-data-server-buildsize     "146 MB">
-  <!ENTITY evolution-data-server-time          "2.9 SBU">
+  <!ENTITY evolution-data-server-download-http "http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/1.4/evolution-data-server-&evolution-data-server-version;.tar.bz2">
+  <!ENTITY evolution-data-server-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/1.4/evolution-data-server-&evolution-data-server-version;.tar.bz2">
+  <!ENTITY evolution-data-server-md5sum        "1590ec25527b1bcc5046e84ec2d1227f">
+  <!ENTITY evolution-data-server-size          "14.1 MB">
+  <!ENTITY evolution-data-server-buildsize     "171 MB">
+  <!ENTITY evolution-data-server-time          "3.5 SBU (additional 0.4 SBU to run the test suite)">
 ]>
 
 <sect1 id="evolution-data-server"
@@ -66,7 +66,9 @@ xreflabel="Evolution Data Server-&evolution-data-server-version;">
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para><xref linkend="openldap"/>,
-    <xref linkend="mozilla"/> (nsp4 libs for SSL and S/MIME support),
+    <xref linkend="mozilla"/> or
+    <xref linkend="firefox"/> or
+    <xref linkend="thunderbird"/> (NSS/NSPR libs for SSL and S/MIME support),
     <xref linkend="sendmail"/>,
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
@@ -86,7 +88,15 @@ xreflabel="Evolution Data Server-&evolution-data-server-version;">
     --sysconfdir=/etc/gnome &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
+    <para>To test the results, issue: <command>make check</command>. If you
+    used <application>Firefox</application> or
+    <application>Thunderbird</application> NSS and NSPR libraries for SSL and
+    S/MIME support, you may need to add the appropriate library directory
+    (e.g.,
+    <filename class='directory'>/usr/lib/firefox-&firefox-version;</filename>)
+    to <filename>/etc/ld.so.conf</filename> and run <command>ldconfig</command>
+    as the <systemitem class="username">root</systemitem> user before running
+    the test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -107,10 +117,9 @@ make</userinput></screen>
     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
     <note>
-      <para>To enable many of the optional dependencies, review the
-      information from <command>./configure --help</command> for the necessary
-      parameters you must pass to the <command>configure</command>
-      script.</para>
+      <para>To enable many of the optional dependencies, review the information
+      from <command>./configure --help</command> for the necessary parameters
+      you must pass to the <command>configure</command> script.</para>
     </note>
 
   </sect2>
@@ -125,17 +134,18 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>camel-index-control-1.2, camel-lock-helper-1.2, and
-        evolution-data-server-1.2</seg>
+        evolution-data-server-1.4</seg>
         <seg>libcamel-1.2.so, libcamel-provider-1.2.so, libebook-1.2.so,
         libecal-1.2.so, libedata-book-1.2.so, libedata-cal-1.2.so,
-        libedataserver-1.2.so, libedataserverui-1.2.so, libegroupwise-1.2.so, and
-        numerous provider and extension modules.</seg>
-        <seg>$GNOME_PREFIX/include/evolution-data-server-1.2,
+        libedataserver-1.2.so, libedataserverui-1.2.so, libegroupwise-1.2.so,
+        libexchange-storage-1.2.so and numerous provider and extension
+        modules.</seg>
+        <seg>$GNOME_PREFIX/include/evolution-data-server-1.4,
         $GNOME_PREFIX/lib/evolution-data-server-1.2,
-        $GNOME_PREFIX/share/evolution-data-server-1.2,
-        $GNOME_PREFIX/share/pixmaps/evolution-data-server-1.2,
-        $GNOME_PREFIX/share/idl/evolution-data-server-1.2, and
-        $GNOME_PREFIX/share/gtk-doc/html/libe*</seg>
+        $GNOME_PREFIX/share/evolution-data-server-1.4,
+        $GNOME_PREFIX/share/idl/evolution-data-server-1.2,
+        $GNOME_PREFIX/share/gtk-doc/html/libe* and
+        $GNOME_PREFIX/share/pixmaps/evolution-data-server-1.4</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 6fe62d722e..0b88f443f0 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>October 10th, 2005</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to Evolution Data Server-1.4.1.1.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated core GNOME packages to the 2.12.1 release of
           GNOME. GNOME add-on packages are updated only to the release