Index: gnome-systemd/platform/evolution-data-server.xml
===================================================================
--- gnome-systemd/platform/evolution-data-server.xml	(revision 009afbebc899a2ec65a2e18b6b2d607bb45ae6cc)
+++ gnome-systemd/platform/evolution-data-server.xml	(revision 5b142c1949542654a5fb609df44b6d60802166b7)
@@ -9,7 +9,7 @@
   <!ENTITY evolution-data-server-download-ftp
            "&gnome-download-ftp;/evolution-data-server/3.12/evolution-data-server-&evolution-data-server-version;.tar.xz">
-  <!ENTITY evolution-data-server-md5sum        "1d256a644e6968142147e48004e9d62f">
+  <!ENTITY evolution-data-server-md5sum        "9097a93b2a27ed0a795adb8acd145187">
   <!ENTITY evolution-data-server-size          "5.2 MB">
-  <!ENTITY evolution-data-server-buildsize     "225 MB">
+  <!ENTITY evolution-data-server-buildsize     "245 MB">
   <!ENTITY evolution-data-server-time          "2.2 SBU">
 ]>
@@ -82,12 +82,8 @@
     <para role="required">
       <xref linkend="db"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="gnome-online-accounts"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="libgdata"/>,
       <xref linkend="gcr"/>,
-      <xref linkend="liboauth"/>,
-      <xref linkend="libical"/>, and
+      <xref linkend="libical"/>,
+      <xref linkend="libsecret"/>,
+      <xref linkend="libsoup"/>, and
       <xref linkend="nss"/>
     </para>
@@ -95,9 +91,10 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libgweather"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="libsecret"/>,
+      <xref linkend="gnome-online-accounts"/>,
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk3"/>,
+      <xref linkend="icu"/>,
       <xref linkend="libgdata"/>,
-      <xref linkend="gobject-introspection"/>, and
+      <xref linkend="libgweather"/>, and
       <xref linkend="vala"/>
     </para>
@@ -107,6 +104,8 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="mitkrb"/>,
-      a <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command), and
+      a <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command),
       <xref linkend="openldap"/>
+      <ulink url="https://code.google.com/p/accounts-sso/">Accounts-SSO</ulink>, and
+      <ulink url="https://code.google.com/p/libphonenumber/">libphonenumber</ulink>
     </para>
 
@@ -126,11 +125,8 @@
 <screen><userinput>./configure --prefix=/usr \
             --disable-uoa \
-            --libexecdir=/usr/lib/evolution-data-server \
-            --enable-vala-bindings \
-            --enable-introspection=yes &amp;&amp;
+            --enable-vala-bindings &amp;&amp;
 make</userinput></screen>
 
     <para>
-      <!-- To test the results, issue: <command>make check</command>. -->
       This package does not have a working testsuite.
     </para>
@@ -148,7 +144,14 @@
 
     <para>
-      <option>--enable-vala-bindings</option>: This switch enables
-      building of the Vala bindings. Remove if you don't have
-      <xref linkend="vala"/> installed.
+      <parameter>--disable-uoa</parameter>: This switch is used
+      to disable <application>Ubuntu Online Accounts</application>
+      support in <application>Evolution Data Server</application>.
+      Remove it if you have installed Accounts-SSO.
+    </para>
+
+    <para>
+      <parameter>--enable-vala-bindings</parameter>: This switch
+      enables building of the Vala bindings. Remove if you don't
+      have <xref linkend="vala"/> installed.
     </para>
 
@@ -160,14 +163,9 @@
 
     <para>
-      <parameter>--with-krb5=/usr</parameter>: Use this switch to
+      <option>--with-krb5=/usr</option>: Use this switch to
       enable <application>Kerberos 5</application> support in
       <application>Evolution Data Server</application>.
     </para>
 
-    <para>
-      <parameter>--disable-uoa</parameter>: Use this switch to
-      disable <application>Ubuntu Online Accounts</application> support in
-      <application>Evolution Data Server</application>.
-    </para>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
Index: gnome-systemd/platform/folks.xml
===================================================================
--- gnome-systemd/platform/folks.xml	(revision 009afbebc899a2ec65a2e18b6b2d607bb45ae6cc)
+++ gnome-systemd/platform/folks.xml	(revision 5b142c1949542654a5fb609df44b6d60802166b7)
@@ -9,5 +9,5 @@
   <!ENTITY folks-md5sum        "18f3e0799fdea55be7e27bc16e73bd8a">
   <!ENTITY folks-size          "1.8 MB">
-  <!ENTITY folks-buildsize     "136 MB">
+  <!ENTITY folks-buildsize     "215 MB">
   <!ENTITY folks-time          "2.1 SBU">
 ]>
@@ -78,6 +78,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libgee"/> and
-      <xref linkend="telepathy-glib"/>
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="libgee08"/>
     </para>
 
@@ -85,9 +85,15 @@
     <para role="recommended">
       <xref linkend="evolution-data-server"/>,
-      <xref linkend="telepathy-glib"/>, and
+      <xref linkend="telepathy-glib"/>,
+      <xref linkend="python3"/>, and
       <xref linkend="vala"/>
     </para>
 
-<!-- optional zeitgeist, libsocialweb -->
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="&gnome-download-http;/libsocialweb/">libsocialweb</ulink>,
+      <ulink url="&gnome-download-http;/tracker/">Tracker</ulink>, and
+      <ulink url="http://zeitgeist-project.com/">Zeitgeist</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -123,4 +129,10 @@
 
     <para>
+      <parameter>--disable-fatal-warnings</parameter>: This switch
+      allows the package to build with latest versions of the
+      dependencies.
+    </para>
+
+    <para>
       <option>--enable-tracker-backend</option>: This switch enables
       building of the the <application>Tracker</application> backend.
@@ -130,10 +142,4 @@
       <option>--enable-docs</option>: This switch enables
       documentation generation.
-    </para>
-
-    <para>
-      <parameter>--disable-fatal-warnings</parameter>: This switch
-      allows the build to complete. Without it the
-      build fails.
     </para>
 
@@ -153,7 +159,6 @@
         </seg>
         <seg>
-          libfolks-eds.so, libfolks-libsocialweb.so,
-          libfolks.so, libfolks-telepathy.so,
-          libfolks-dummy.so, and libfolks-tracker.so
+          libfolks-dummy.so, libfolks-eds.so, libfolks-libsocialweb.so,
+          libfolks.so, libfolks-telepathy.so, and libfolks-tracker.so
         </seg>
         <seg>
Index: gnome-systemd/platform/gnome-online-accounts.xml
===================================================================
--- gnome-systemd/platform/gnome-online-accounts.xml	(revision 009afbebc899a2ec65a2e18b6b2d607bb45ae6cc)
+++ gnome-systemd/platform/gnome-online-accounts.xml	(revision 5b142c1949542654a5fb609df44b6d60802166b7)
@@ -9,5 +9,5 @@
   <!ENTITY gnome-online-accounts-download-ftp
            "&gnome-download-ftp;/gnome-online-accounts/3.12/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
-  <!ENTITY gnome-online-accounts-md5sum        "4854416e00b78997f4626846a6cdf962">
+  <!ENTITY gnome-online-accounts-md5sum        "b673101d03f96c3d82bf18fde2e7701c">
   <!ENTITY gnome-online-accounts-size          "1.4 MB">
   <!ENTITY gnome-online-accounts-buildsize     "50 MB">
@@ -77,7 +77,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libnotify"/>,
+      <xref linkend="gcr"/>,
       <xref linkend="librest"/>,
-      <xref linkend="libsecret"/>,
       <xref linkend="json-glib"/>, 
       <xref linkend="telepathy-glib"/>, and
@@ -145,5 +144,5 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
Index: gnome-systemd/platform/libgdata.xml
===================================================================
--- gnome-systemd/platform/libgdata.xml	(revision 009afbebc899a2ec65a2e18b6b2d607bb45ae6cc)
+++ gnome-systemd/platform/libgdata.xml	(revision 5b142c1949542654a5fb609df44b6d60802166b7)
@@ -77,17 +77,15 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gnome-online-accounts"/>,
+      <xref linkend="liboauth"/>,
       <xref linkend="libsoup"/>,
-      <xref linkend="json-glib"/>,
-      <xref linkend="gcr"/>, and
-      <xref linkend="liboauth"/>
+      <xref linkend="json-glib"/>, and
+      <xref linkend="uhttpmock"/>
     </para>
-
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="uhttpmock"/>,
-      <xref linkend="gobject-introspection"/>, and
-      <xref linkend="libxml2"/>
+      <xref linkend="gcr"/>,
+      <xref linkend="gnome-online-accounts"/>, and
+      <xref linkend="gobject-introspection"/>
     </para>
 
@@ -142,5 +140,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: gnome-systemd/platform/librest.xml
===================================================================
--- gnome-systemd/platform/librest.xml	(revision 009afbebc899a2ec65a2e18b6b2d607bb45ae6cc)
+++ gnome-systemd/platform/librest.xml	(revision 5b142c1949542654a5fb609df44b6d60802166b7)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY librest-download-http "http://ftp.acc.umu.se/pub/GNOME/sources/rest/0.7/rest-&librest-version;.tar.xz">
-  <!ENTITY librest-download-ftp  " ">
+  <!ENTITY librest-download-http "&gnome-download-http;/rest/0.7/rest-&librest-version;.tar.xz">
+  <!ENTITY librest-download-ftp  "&gnome-download-ftp;/rest/0.7/rest-&librest-version;.tar.xz">
   <!ENTITY librest-md5sum        "abd6211788b9b8dac432a26767099a27">
   <!ENTITY librest-size          "316 KB">
@@ -76,5 +76,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="cacerts"/>, and
+      <xref linkend="cacerts"/> and
       <xref linkend="libsoup"/>
     </para>
@@ -103,6 +103,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --with-ca-certificates=/etc/ssl/ca-bundle.crt &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -116,14 +115,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-ca-certificates=/etc/ssl/ca-bundle.crt</parameter>:
-      The configure script needs to be pointed to the certificates.
-    </para>
 
   </sect2>
@@ -156,5 +145,5 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="librest-0">
+      <varlistentry id="librest-0.7">
         <term><filename class="libraryfile">librest-0.7.so</filename></term>
         <listitem>
@@ -162,11 +151,11 @@
             contains the RESTful Web API Query functions.
           </para>
-          <indexterm zone="librest librest-0">
-            <primary sortas="c-librest-0">librest-0.7.so</primary>
+          <indexterm zone="librest librest-0.7">
+            <primary sortas="c-librest-0.7">librest-0.7.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="librest-extras-0">
+      <varlistentry id="librest-extras-0.7">
         <term><filename class="libraryfile">librest-extras-0.7.so</filename></term>
         <listitem>
@@ -174,6 +163,6 @@
             contains extra RESTful Web API Query functions.
           </para>
-          <indexterm zone="librest librest-extras-0">
-            <primary sortas="c-librest-extras-0">librest-extras-0.7.so</primary>
+          <indexterm zone="librest librest-extras-0.7">
+            <primary sortas="c-librest-extras-0.7">librest-extras-0.7.so</primary>
           </indexterm>
         </listitem>
