Index: general.ent
===================================================================
--- general.ent	(revision a07f939cd8fd1fd3c4b313846766427071dc427f)
+++ general.ent	(revision da0b26c5bd499f44f1204927614d599f8532c2e7)
@@ -687,5 +687,5 @@
 <!ENTITY gnome-doc-utils-version      "0.20.6">
 <!ENTITY gnome-js-common-version      "0.1.2">
-<!ENTITY libgnomekbd-version          "2.30.1">
+<!ENTITY libgnomekbd-version          "3.2.0">
 <!ENTITY libgnome-keyring-version     "2.30.1">
 <!ENTITY libgtop-version              "2.28.1">
Index: gnome/core/libgnomekbd.xml
===================================================================
--- gnome/core/libgnomekbd.xml	(revision a07f939cd8fd1fd3c4b313846766427071dc427f)
+++ gnome/core/libgnomekbd.xml	(revision da0b26c5bd499f44f1204927614d599f8532c2e7)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY libgnomekbd-download-http "&gnome-download-http;/libgnomekbd/&gnome-version;/libgnomekbd-&libgnomekbd-version;.tar.bz2">
-  <!ENTITY libgnomekbd-download-ftp  "&gnome-download-ftp;/libgnomekbd/&gnome-version;/libgnomekbd-&libgnomekbd-version;.tar.bz2">
-  <!ENTITY libgnomekbd-md5sum        "9b828a4e35089d91b9ea16ddf981ff28">
-  <!ENTITY libgnomekbd-size          "395 KB">
-  <!ENTITY libgnomekbd-buildsize     "9 MB">
-  <!ENTITY libgnomekbd-time          "0.2 SBU">
+  <!ENTITY libgnomekbd-download-http "&gnome-download-http;/libgnomekbd/&gnome-version;/libgnomekbd-&libgnomekbd-version;.tar.xz">
+  <!ENTITY libgnomekbd-download-ftp  "&gnome-download-ftp;/libgnomekbd/&gnome-version;/libgnomekbd-&libgnomekbd-version;.tar.xz">
+  <!ENTITY libgnomekbd-md5sum        "ba185a14cb128041205d618a465f9de3">
+  <!ENTITY libgnomekbd-size          "368 KB">
+  <!ENTITY libgnomekbd-buildsize     "12 MB">
+  <!ENTITY libgnomekbd-time          "0.5 SBU">
 ]>
 
@@ -33,5 +33,5 @@
     used by the GNOME desktop.</para>
 
-    &lfs65_checked;
+    &lfs70_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -60,6 +60,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
-    <xref linkend="gtk2"/>, and
+    <para role="required"><xref linkend="gtk3"/>,
+    <xref linkend="intltool"/>, and
     <xref linkend="libxklavier"/></para>
 
@@ -75,6 +75,5 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
 make</userinput></screen>
 
@@ -93,6 +92,6 @@
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
+    <para><option>--enable-static=no</option>: This switch prevents the static
+    libraries being installed.</para>
 
   </sect2>
@@ -107,8 +106,8 @@
 
       <seglistitem>
-        <seg>gkbd-indicator-plugins-capplet</seg>
+        <seg>gkbd-indicator-plugins-capplet and gkbd-keyboard-display</seg>
         <seg>libgnomekbd.{so,a} and libgnomekbdui.{so,a}</seg>
         <seg><envar>$GNOME_PREFIX</envar>/{include/libgnomekbd,
-        share/libgnomekbd/ui}</seg>
+        share/libgnomekbd/{icons,ui}}</seg>
       </seglistitem>
     </segmentedlist>
@@ -130,4 +129,14 @@
       </varlistentry>
 
+      <!--<varlistentry id="gkbd-keyboard-display">
+        <term><command>gkbd-keyboard-display</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="libgnomekbd gkbd-keyboard-display">
+            <primary sortas="b-gkbd-keyboard-display">gkbd-keyboard-display</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>-->
+
       <varlistentry id="libgnomekbd-lib">
         <term><filename class='libraryfile'>libgnomekbd{,ui}.{so,a}</filename></term>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision a07f939cd8fd1fd3c4b313846766427071dc427f)
+++ introduction/welcome/changelog.xml	(revision da0b26c5bd499f44f1204927614d599f8532c2e7)
@@ -69,4 +69,7 @@
           <para>[ken] - merge gucharmap-3.2.2 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge libgnomekbd-3.2.0 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
