Index: general.ent
===================================================================
--- general.ent	(revision 95b8c6df9df4346b6e46ec9d215272292eb2339c)
+++ general.ent	(revision 8cb45e5717ed0924615d547a498583b6fc32cf69)
@@ -680,4 +680,5 @@
 <!-- Chapter 32 -->
 <!-- Libraries -->
+<!ENTITY caribou-version              "0.4.1">
 <!ENTITY GConf-version                "3.2.3">
 <!ENTITY gnome-desktop-version        "2.30.2">
Index: gnome/core/caribou.xml
===================================================================
--- gnome/core/caribou.xml	(revision 8cb45e5717ed0924615d547a498583b6fc32cf69)
+++ gnome/core/caribou.xml	(revision 8cb45e5717ed0924615d547a498583b6fc32cf69)
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY caribou-download-http "&gnome-download-http;/caribou/0.4/caribou-&caribou-version;.tar.xz">
+  <!ENTITY caribou-download-ftp  "&gnome-download-ftp;/caribou/0.4/caribou-&caribou-version;.tar.xz">
+  <!ENTITY caribou-md5sum        "c03cb3e121547222e9c4fe7bf527fee0">
+  <!ENTITY caribou-size          "353 KB">
+  <!ENTITY caribou-buildsize     "13 MB">
+  <!ENTITY caribou-time          "0.2 SBU">
+]>
+
+<sect1 id="caribou" xreflabel="caribou-&caribou-version;">
+  <?dbhtml filename="caribou.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>caribou-&caribou-version;</title>
+
+  <indexterm zone="caribou">
+    <primary sortas="a-caribou">caribou</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to caribou</title>
+
+    <para><application>Caribou</application> is an on screen keyboard, and
+    a shared library for other on screen keyboards
+
+    </para>
+
+    &lfs70_built;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&caribou-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&caribou-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &caribou-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &caribou-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &caribou-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &caribou-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">caribou Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="pygobject3"/>,
+    <xref linkend="gtk3"/>,
+    <xref linkend="clutter"/>,
+    <xref linkend="libgee"/>,
+    <xref linkend="libxklavier"/>, and
+    <xref linkend="vala"/></para>
+
+    <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
+    <para role="optional">For most <application>GNOME</application> users, this
+    package is only required as a compile-time dependency for other packages. If
+    you intend to use its keyboard you will require
+    <!-- FIXME:ken 1
+    <xref linkend="pyatspi"/>, -->
+    pyatspi2-2.2.1,
+    <xref linkend="dbus-python"/>
+    <!-- FIXME:ken 2
+    and <xref linkend="dconf"/> at runtime.</para>-->
+    and dconf-0.10.0 at runtime.</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/caribou"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of caribou</title>
+
+    <para>Install <application>caribou</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+            --sysconfdir=$GNOME_SYSCONFDIR \
+            --libexecdir=$GNOME_PREFIX/lib/caribou \
+            --disable-gtk2-module &amp;&amp;
+make</userinput></screen>
+
+    <para>This package's testsuite is only intended to be used by the
+    maintainer to check i18n files.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--sysconfdir=$GNOME_SYSCONFDIR</parameter>: This parameter puts
+    the gconf schemas in the correct location, instead of
+    <filename class="directory">/usr/libexec</filename></para>
+
+    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/caribou</parameter>: This
+    parameter ensures <filename>antler-keyboard</filename> is put in a directory
+    which accords with the FHS, instead of
+    <filename class="directory">/usr/libexec</filename>.</para>
+
+    <para><parameter>--disable-gtk2-module</parameter>: Because
+    <application>GNOME</application> now uses <application>Gtk+-3</application>,
+    the module has no use in a <application>GNOME</application> desktop.</para>
+
+    <para><option>--enable-static=no</option>: This switch prevents the static
+    libraries being installed.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>antler-keyboard, caribou, and caribou-preferences</seg>
+        <seg>libcaribou-gtk-module.{so,a} and libcaribou.{so,a}</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/{include/libcaribou,lib/{caribou,python2.7/site-packages/caribou/{antler,daemon,settings}},share/{antler,caribou/layouts/{fullscale,scan,touch}}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="antler-keyboard">
+        <term><command>antler-keyboard</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="caribou antler-keyboard">
+            <primary sortas="b-antler-keyboard">antler-keyboard</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="caribou-prog">
+        <term><command>caribou-prog</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="caribou caribou-prog">
+            <primary sortas="b-caribou-prog">caribou-prog</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="caribou-preferences">
+        <term><command>caribou-preferences</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="caribou caribou-preferences">
+            <primary sortas="b-caribou-preferences">caribou-preferences</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcaribou-gtk-module">
+        <term><filename class='libraryfile'>libcaribou-gtk-module.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions that .....</para>
+          <indexterm zone="caribou libcaribou-gtk-module">
+            <primary sortas="c-libcaribou-gtk-module">libcaribou-gtk-module.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcaribou">
+        <term><filename class='libraryfile'>libcaribou.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions that .....</para>
+          <indexterm zone="caribou libcaribou">
+            <primary sortas="c-libcaribou">libcaribou.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/core/core.xml
===================================================================
--- gnome/core/core.xml	(revision 95b8c6df9df4346b6e46ec9d215272292eb2339c)
+++ gnome/core/core.xml	(revision 8cb45e5717ed0924615d547a498583b6fc32cf69)
@@ -35,5 +35,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-libraries.xml"/>
 
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="caribou.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="caribou.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gconf.xml"/>
   <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gjs.xml"/>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 95b8c6df9df4346b6e46ec9d215272292eb2339c)
+++ introduction/welcome/changelog.xml	(revision 8cb45e5717ed0924615d547a498583b6fc32cf69)
@@ -53,4 +53,7 @@
           <para>[ken] - merge brasero-3.2.0 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - add caribou-0.4.1 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
