Index: general.ent
===================================================================
--- general.ent	(revision 2582df23bffe3f00a4ec3532aa08dc18786f2117)
+++ general.ent	(revision ec837b8b37ab902bfba95386de4d7935dbe1ba93)
@@ -257,4 +257,5 @@
 <!ENTITY libxml2-version              "2.9.1">
 <!ENTITY libxslt-version              "1.1.28">
+<!ENTITY libzeitgeist-version         "0.3.18">
 <!ENTITY LZO-version                  "2.06">
 <!ENTITY mtdev-version                "1.1.3">
@@ -639,5 +640,4 @@
 <!ENTITY libpeas-version              "1.8.1">
 <!ENTITY libwnck-version              "3.4.5">
-<!ENTITY libzeitgeist-version         "0.3.18">
 <!ENTITY totem-pl-parser-version      "3.4.5">
 <!ENTITY vte-version                  "0.34.7">
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 2582df23bffe3f00a4ec3532aa08dc18786f2117)
+++ general/genlib/genlib.xml	(revision ec837b8b37ab902bfba95386de4d7935dbe1ba93)
@@ -88,4 +88,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxml2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxslt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libzeitgeist.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lzo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mtdev.xml"/>
Index: general/genlib/libzeitgeist.xml
===================================================================
--- general/genlib/libzeitgeist.xml	(revision ec837b8b37ab902bfba95386de4d7935dbe1ba93)
+++ general/genlib/libzeitgeist.xml	(revision ec837b8b37ab902bfba95386de4d7935dbe1ba93)
@@ -0,0 +1,171 @@
+<?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 libzeitgeist-download-http
+           "https://launchpad.net/libzeitgeist/0.3/&libzeitgeist-version;/+download/libzeitgeist-&libzeitgeist-version;.tar.gz">
+  <!ENTITY libzeitgeist-download-ftp  " ">
+  <!ENTITY libzeitgeist-md5sum        "d63a37295d01a58086d0d4ae26e604c2">
+  <!ENTITY libzeitgeist-size          "516 KB">
+  <!ENTITY libzeitgeist-buildsize     "7.0 MB">
+  <!ENTITY libzeitgeist-time          "0.1 SBU">
+]>
+
+<sect1 id="libzeitgeist" xreflabel="libzeitgeist-&libzeitgeist-version;">
+  <?dbhtml filename="libzeitgeist.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libzeitgeist-&libzeitgeist-version;</title>
+
+  <indexterm zone="libzeitgeist">
+    <primary sortas="a-libzeitgeist">libzeitgeist</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libzeitgeist</title>
+
+    <para>
+      The <application>libzeitgeist</application> package contains a client
+      library used to access and manage the Zeitgeist event log from
+      languages such as C and Vala. Zeitgeist is a service which logs
+      the user's activities and events (files opened, websites visited,
+      conversations hold with other people, etc.) and makes the relevant
+      information available to other applications.
+    </para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libzeitgeist-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libzeitgeist-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libzeitgeist-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libzeitgeist-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libzeitgeist-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libzeitgeist-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libzeitgeist Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libzeitgeist"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libzeitgeist</title>
+
+    <para>
+      Install <application>libzeitgeist</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not have a working testsuite.
+    </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>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libzeitgeist-1.0.so
+        </seg>
+        <seg>
+          /usr/include/libzeitgeist-1.0 and
+          /usr/share/doc/libzeitgeist
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libzeitgeist-1">
+        <term><filename class="libraryfile">libzeitgeist-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libzeitgeist</application> API functions.
+          </para>
+          <indexterm zone="libzeitgeist libzeitgeist-1">
+            <primary sortas="c-libzeitgeist-1">libzeitgeist-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: ome/platform/libzeitgeist.xml
===================================================================
--- gnome/platform/libzeitgeist.xml	(revision 2582df23bffe3f00a4ec3532aa08dc18786f2117)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?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 libzeitgeist-download-http
-           "https://launchpad.net/libzeitgeist/0.3/&libzeitgeist-version;/+download/libzeitgeist-&libzeitgeist-version;.tar.gz">
-  <!ENTITY libzeitgeist-download-ftp  " ">
-  <!ENTITY libzeitgeist-md5sum        "d63a37295d01a58086d0d4ae26e604c2">
-  <!ENTITY libzeitgeist-size          "516 KB">
-  <!ENTITY libzeitgeist-buildsize     "7.0 MB">
-  <!ENTITY libzeitgeist-time          "0.1 SBU">
-]>
-
-<sect1 id="libzeitgeist" xreflabel="libzeitgeist-&libzeitgeist-version;">
-  <?dbhtml filename="libzeitgeist.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libzeitgeist-&libzeitgeist-version;</title>
-
-  <indexterm zone="libzeitgeist">
-    <primary sortas="a-libzeitgeist">libzeitgeist</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libzeitgeist</title>
-
-    <para>
-      The <application>libzeitgeist</application> package contains a client
-      library used to access and manage the Zeitgeist event log from
-      languages such as C and Vala. Zeitgeist is a service which logs
-      the user's activities and events (files opened, websites visited,
-      conversations hold with other people, etc.) and makes the relevant
-      information available to other applications.
-    </para>
-
-    &lfs73_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libzeitgeist-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libzeitgeist-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libzeitgeist-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libzeitgeist-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libzeitgeist-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libzeitgeist-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libzeitgeist Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libzeitgeist"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libzeitgeist</title>
-
-    <para>
-      Install <application>libzeitgeist</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite.
-    </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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libzeitgeist-1.0.so
-        </seg>
-        <seg>
-          /usr/include/libzeitgeist-1.0 and
-          /usr/share/doc/libzeitgeist
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libzeitgeist-1">
-        <term><filename class="libraryfile">libzeitgeist-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libzeitgeist</application> API functions.
-          </para>
-          <indexterm zone="libzeitgeist libzeitgeist-1">
-            <primary sortas="c-libzeitgeist-1">libzeitgeist-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/platform/platform.xml
===================================================================
--- gnome/platform/platform.xml	(revision 2582df23bffe3f00a4ec3532aa08dc18786f2117)
+++ gnome/platform/platform.xml	(revision ec837b8b37ab902bfba95386de4d7935dbe1ba93)
@@ -41,5 +41,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpeas.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwnck.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libzeitgeist.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="totem-pl-parser.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vte.xml"/>
Index: xfce/apps/midori.xml
===================================================================
--- xfce/apps/midori.xml	(revision 2582df23bffe3f00a4ec3532aa08dc18786f2117)
+++ xfce/apps/midori.xml	(revision ec837b8b37ab902bfba95386de4d7935dbe1ba93)
@@ -76,4 +76,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="libzeitgeist"/>,
       <xref linkend="webkitgtk"/> or
       <xref linkend="webkitgtk2"/> and
@@ -91,8 +92,7 @@
       <ulink url="&gnome-download-http;/gnome-keyring/">GNOME Keyring (2.x)</ulink> or
       <xref linkend="gcr"/>,
-      <xref linkend="gtk-doc"/>,
+      <xref linkend="gtk-doc"/> and
       <xref linkend="libunique"/> or
-      <ulink url="&gnome-download-http;/libunique/">libunique (3.x)</ulink> and
-      <xref linkend="libzeitgeist"/>
+      <ulink url="&gnome-download-http;/libunique/">libunique (3.x)</ulink>
     </para>
 
