Index: general.ent
===================================================================
--- general.ent	(revision f42801c0e161c16b9900b5048b9e44ae289f96cd)
+++ general.ent	(revision 2a01794158548952b18355b43eed0ea0907bf478)
@@ -702,5 +702,5 @@
 <!ENTITY gnome-icon-theme-extras-version "3.0.0">
 <!ENTITY gnome-icon-theme-symbolic-version "3.2.1">
-<!ENTITY gnome-keyring-version        "2.30.3">
+<!ENTITY gnome-keyring-version        "3.2.2">
 <!ENTITY gnome-menus-version          "2.30.2">
 <!ENTITY gnome-session-version        "2.30.2">
Index: gnome/core/gnome-keyring.xml
===================================================================
--- gnome/core/gnome-keyring.xml	(revision f42801c0e161c16b9900b5048b9e44ae289f96cd)
+++ gnome/core/gnome-keyring.xml	(revision 2a01794158548952b18355b43eed0ea0907bf478)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gnome-keyring-download-http "&gnome-download-http;/gnome-keyring/&gnome-version;/gnome-keyring-&gnome-keyring-version;.tar.bz2">
-  <!ENTITY gnome-keyring-download-ftp  "&gnome-download-ftp;/gnome-keyring/&gnome-version;/gnome-keyring-&gnome-keyring-version;.tar.bz2">
-  <!ENTITY gnome-keyring-md5sum        "54cb1835c02a40f27fda73e58da17cc6">
-  <!ENTITY gnome-keyring-size          "1.5 MB">
-  <!ENTITY gnome-keyring-buildsize     "52 MB">
-  <!ENTITY gnome-keyring-time          "0.6 SBU">
+  <!ENTITY gnome-keyring-download-http "&gnome-download-http;/gnome-keyring/&gnome-version;/gnome-keyring-&gnome-keyring-version;.tar.xz">
+  <!ENTITY gnome-keyring-download-ftp  "&gnome-download-ftp;/gnome-keyring/&gnome-version;/gnome-keyring-&gnome-keyring-version;.tar.xz">
+  <!ENTITY gnome-keyring-md5sum        "0269f897bf6bc71df8b8cecd5f8e2f6c">
+  <!ENTITY gnome-keyring-size          "1.6 MB">
+  <!ENTITY gnome-keyring-buildsize     "165 MB">
+  <!ENTITY gnome-keyring-time          "1.3 SBU">
 ]>
 
@@ -33,5 +33,5 @@
     daemon that keeps passwords and other secrets for users.</para>
 
-    &lfs65_built;
+    &lfs70_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -57,4 +57,12 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required Patch: <ulink
+        url="&patch-root;/gnome-keyring-&gnome-keyring-version;-work_without_daemon-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">gnome-keyring Dependencies</bridgehead>
 
@@ -63,6 +71,7 @@
     <xref linkend="gtk2"/>,
     <xref linkend="intltool"/>,
-    <xref linkend="libgcrypt"/>, and
-    <xref linkend="libtasn1"/></para>
+    <xref linkend="libgcrypt"/>,
+    <xref linkend="libtasn1"/>, and
+    <xref linkend="p11-kit"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -85,8 +94,8 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --libexecdir=$(pkg-config \
-            --variable=prefix ORBit-2.0)/lib/gnome-keyring \
-                --sysconfdir=&gnome-etc-dir; \
+<screen><userinput>patch -Np1 -i ../gnome-keyring-&gnome-keyring-version;-work_without_daemon-1.patch &amp;&amp;
+./configure --prefix=$GNOME_PREFIX \
+            --libexecdir=$GNOME_PREFIX/lib/gnome-keyring \
+            --sysconfdir=$GNOME_SYSCONFDIR \
             --with-pam-dir=/lib/security \
             --with-dbus-services=/usr/share/dbus-1/services \
@@ -105,26 +114,34 @@
     <title>Command Explanations</title>
 
+    <para><command>patch -Np1 -i ...</command>: The patch allows testsuites from
+    other packages which invoke <application>gnome-keyring</application>, such as
+    <application>NetworkManager,</application> to run even if this package&apos;s
+    daemon is not running, for example when you are building a
+    <application>GNOME</application> desktop.</para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gnome-keyring</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/gnome-keyring</filename>
-    instead of
+    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/gnome-keyring</parameter>:
+    This parameter causes the libexec files to be installed in the preferred
+    location of <filename
+    class="directory">$GNOME_PREFIX/lib/gnome-keyring</filename> instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
+    <para><parameter>--sysconfdir=$GNOME_SYSCONFDIR</parameter>: This parameter
+    ensures that the xdg autostart files are installed in a suitable location.
+    </para>
+
     <para><parameter>--with-pam-dir=/lib/security</parameter>: This parameter
-    specifies where the pam modules will be installed into.</para>
+    specifies where the pam modules will be installed: you can omit this if you
+    have not installed <application>Linux-PAM</application>.</para>
 
     <para><parameter>--with-dbus-services=/usr/share/dbus-1/services</parameter>:
     This parameter specifies where the <application>D-BUS</application> session
-    services directory is located.</para>
+    services directory is located: you can omit this if your GNOME_PREFIX is
+    <filename class="directory">/usr</filename>.</para>
 
     <para><parameter>--with-root-certs=/etc/ssl/certs</parameter>: This
     parameter specifies where the trusted root certificates are located.</para>
-
-    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
-    wish to disable the updates to the scrollkeeper database.</para>
 
   </sect2>
@@ -143,5 +160,5 @@
         gnome-keyring-pkcs11.so, gck-roots-store-standalone.so,
         gck-secret-store-standalone.so, libgcr.so, libgp11.so, and
-        pam_gnome_keyring.so</seg>
+        pam_gnome_keyring.so (if Linux-PAM was installed)</seg>
         <seg><envar>$GNOME_PREFIX</envar>/{include/{gcr,gp11},
         lib/gnome-keyring/{devel,standalone},share/{gcr/ui,
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f42801c0e161c16b9900b5048b9e44ae289f96cd)
+++ introduction/welcome/changelog.xml	(revision 2a01794158548952b18355b43eed0ea0907bf478)
@@ -60,4 +60,7 @@
           <para>[ken] - add gnome-js-common from Wayne, but updated to 0.1.2.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge gnome-keyring-3.2.2 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
