Index: general.ent
===================================================================
--- general.ent	(revision ed4a7a25158650b74ecc19c65fe5821549a137d8)
+++ general.ent	(revision dbcebcfcdd56256842c2a19791e7de5a2c0caf10)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "12">                   <!-- Always 2 digits -->
+<!ENTITY day          "13">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 12th &year;">
+<!ENTITY releasedate  "January 13th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision ed4a7a25158650b74ecc19c65fe5821549a137d8)
+++ general/genlib/genlib.xml	(revision dbcebcfcdd56256842c2a19791e7de5a2c0caf10)
@@ -90,4 +90,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstatgrab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtasn1.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunique.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunistring.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libusb.xml"/>
Index: general/genlib/libunique.xml
===================================================================
--- general/genlib/libunique.xml	(revision dbcebcfcdd56256842c2a19791e7de5a2c0caf10)
+++ general/genlib/libunique.xml	(revision dbcebcfcdd56256842c2a19791e7de5a2c0caf10)
@@ -0,0 +1,190 @@
+<?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 libunique-download-http "&gnome-download-http;/libunique/1.1/libunique-&libunique-version;.tar.bz2">
+  <!ENTITY libunique-download-ftp  "&gnome-download-ftp;/libunique/1.1/libunique-&libunique-version;.tar.bz2">
+  <!ENTITY libunique-md5sum        "7955769ef31f1bc4f83446dbb3625e6d">
+  <!ENTITY libunique-size          "328 KB">
+  <!ENTITY libunique-buildsize     "7.0 MB">
+  <!ENTITY libunique-time          "0.2 SBU">
+]>
+
+<sect1 id="libunique" xreflabel="libunique-&libunique-version;">
+  <?dbhtml filename="libunique.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libunique-&libunique-version;</title>
+
+  <indexterm zone="libunique">
+    <primary sortas="a-libunique">libunique</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libunique</title>
+
+    <para>
+      The <application>libunique</application> package contains a
+      library for writing single instance applications.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libunique-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libunique-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libunique-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libunique-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libunique-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libunique-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/libunique-&libunique-version;-upstream_fixes-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libunique Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtk2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libunique"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libunique</title>
+
+    <para>
+      Install <application>libunique</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../libunique-&libunique-version;-upstream_fixes-1.patch &amp;&amp;
+autoreconf -fi &amp;&amp;
+
+./configure --prefix=/usr  \
+            --disable-dbus \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </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>
+      <option>--disable-dbus</option>: This switch disables
+      <application>D-Bus</application> backend in favor of
+      the GDBus backend.
+    </para>
+
+    <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>
+          libunique-1.0.so
+        </seg>
+        <seg>
+          /usr/include/unique-1.0 and
+          /usr/share/gtk-doc/html/unique
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libunique-1">
+        <term><filename class="libraryfile">libunique-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libunique</application> API functions
+            for single instance support.
+          </para>
+          <indexterm zone="libunique libunique-1">
+            <primary sortas="c-libunique-1">libunique-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/graphlib/harfbuzz.xml
===================================================================
--- general/graphlib/harfbuzz.xml	(revision ed4a7a25158650b74ecc19c65fe5821549a137d8)
+++ general/graphlib/harfbuzz.xml	(revision dbcebcfcdd56256842c2a19791e7de5a2c0caf10)
@@ -8,6 +8,6 @@
            "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-&harfbuzz-version;.tar.bz2">
   <!ENTITY harfbuzz-download-ftp  " ">
-  <!ENTITY harfbuzz-md5sum        "e6210d3cfd4064d95621fc16913268ed">
-  <!ENTITY harfbuzz-size          "1.2 MB">
+  <!ENTITY harfbuzz-md5sum        "671daf05153d57258e5cb992aa28c64a">
+  <!ENTITY harfbuzz-size          "1.3 MB">
   <!ENTITY harfbuzz-buildsize     "53 MB (with tests)">
   <!ENTITY harfbuzz-time          "0.4 SBU (with tests)">
Index: general/prog/elfutils.xml
===================================================================
--- general/prog/elfutils.xml	(revision ed4a7a25158650b74ecc19c65fe5821549a137d8)
+++ general/prog/elfutils.xml	(revision dbcebcfcdd56256842c2a19791e7de5a2c0caf10)
@@ -8,8 +8,8 @@
           "https://fedorahosted.org/releases/e/l/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
   <!ENTITY elfutils-download-ftp  " ">
-  <!ENTITY elfutils-md5sum        "2e4536c1c48034f188a80789a59114d8">
-  <!ENTITY elfutils-size          "5.8 MB">
-  <!ENTITY elfutils-buildsize     "103 MB (with tests)">
-  <!ENTITY elfutils-time          "0.8 SBU (with tests)">
+  <!ENTITY elfutils-md5sum        "c37fdbe18e848002b451562cba964679">
+  <!ENTITY elfutils-size          "6.2 MB">
+  <!ENTITY elfutils-buildsize     "107 MB (with tests)">
+  <!ENTITY elfutils-time          "1 SBU (with tests)">
 ]>
 
@@ -142,7 +142,8 @@
       <seglistitem>
         <seg>
-          eu-addr2line, eu-ar, eu-elfcmp, eu-elflint, eu-findtextrel, eu-ld,
-          eu-make-debug-archive, eu-nm, eu-objdump, eu-ranlib, eu-readelf,
-          eu-size, eu-stack, eu-strings, eu-strip, and eu-unstrip
+          eu-addr2line, eu-ar, eu-elfcmp, eu-elfcompress, eu-elflint,
+          eu-findtextrel, eu-ld, eu-make-debug-archive, eu-nm, eu-objdump,
+          eu-ranlib, eu-readelf, eu-size, eu-stack, eu-strings, eu-strip, and
+          eu-unstrip
         </seg>
         <seg>
@@ -198,4 +199,16 @@
       </varlistentry>
 
+      <varlistentry id="eu-elfcompress">
+        <term><command>eu-elfcompress</command></term>
+        <listitem>
+          <para>
+            compress or decompress sections in an ELF file.
+          </para>
+          <indexterm zone="elfutils eu-elfcompress">
+            <primary sortas="b-eu-elfcompress">eu-elfcompress</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="eu-elflint">
         <term><command>eu-elflint</command></term>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision ed4a7a25158650b74ecc19c65fe5821549a137d8)
+++ introduction/welcome/changelog.xml	(revision dbcebcfcdd56256842c2a19791e7de5a2c0caf10)
@@ -44,4 +44,29 @@
 
 -->
+
+    <listitem>
+      <para>January 13th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Add libunique-1.1.6 as optional dependency to
+          Midori-0.5.11 (built with gtk+2).</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Move libunique-1.1.6 to "9. General Libraries".</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to samba-4.3.4. Fixes
+          <ulink url="&blfs-ticket-root;7349">#7349</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to elfutils-0.165. Fixes
+          <ulink url="&blfs-ticket-root;7348">#7348</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to harfbuzz-1.1.3. Fixes
+          <ulink url="&blfs-ticket-root;7347">#7347</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision ed4a7a25158650b74ecc19c65fe5821549a137d8)
+++ networking/netprogs/samba.xml	(revision dbcebcfcdd56256842c2a19791e7de5a2c0caf10)
@@ -7,8 +7,8 @@
   <!ENTITY samba-download-http "https://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
   <!ENTITY samba-download-ftp  " ">
-  <!ENTITY samba-md5sum        "d7e2bef4deb00178eb310d7b0da3ef8e">
+  <!ENTITY samba-md5sum        "48df803c6c6c475a714cae82a2dc219e">
   <!ENTITY samba-size          "20 MB">
-  <!ENTITY samba-buildsize     "499 MB (additional 408 MB for the quicktest, reputedly up to 500 MB additional for all tests)">
-  <!ENTITY samba-time          "2.3 SBU, using parallelism=4 (additional 22.5 SBU for the quicktest, reputedly up to 110 SBU to run all tests)">
+  <!ENTITY samba-buildsize     "500 MB (additional 407 MB for the quicktest, reputedly up to 500 MB additional for all tests)">
+  <!ENTITY samba-time          "2.2 SBU, using parallelism=4 (additional 23.5 SBU for the quicktest, reputedly up to 110 SBU to run all tests)">
 ]>
 
@@ -83,5 +83,5 @@
       <xref linkend="libgpg-error"/>,
       <xref linkend="linux-pam"/>,
-      <xref linkend="mitkrb"/>,
+      <xref linkend="mitkrb"/> (currently, problems, despite successful build),
       <xref linkend="popt"/>,
       <xref linkend="python3"/>,
@@ -120,19 +120,12 @@
     commands:</para>
 
-<screen><userinput>sed -e "/deps='LIBASYNC_REQ'/              \
-       {
-         s/$/,/
-         a\                 install=False
-       }"                                  \
-    -i lib/async_req/wscript_build         &amp;&amp;
-
-./configure                                \
-    --prefix=/usr                          \
-    --sysconfdir=/etc                      \
-    --localstatedir=/var                   \
-    --with-piddir=/run/samba               \
-    --with-pammodulesdir=/lib/security     \
-    --without-systemd                      \
-    --enable-fhs                           &amp;&amp;
+<screen><userinput>./configure                            \
+    --prefix=/usr                      \
+    --sysconfdir=/etc                  \
+    --localstatedir=/var               \
+    --with-piddir=/run/samba           \
+    --with-pammodulesdir=/lib/security \
+    --without-systemd                  \
+    --enable-fhs                       &amp;&amp;
 
 make</userinput></screen>
@@ -184,15 +177,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><command>sed ... -i ./lib/async_req/wscript_build</command>: Do not
-    install async_connect_send_test.</para><!--
-    #https://bugzilla.samba.org/show_bug.cgi?id=11639#c0
-    # We should have this fix in 4.2.7 and 4.3.4
-
-    Already pushed, so remove in the
-    next version
-    https://github.com/samba-team/samba/blob/632114584d3be0d4660e97a6c9e69e577a7bc1e2/lib/async_req/wscript_build
-    http://samba.2283325.n4.nabble.com/PATCH-lib-async-req-do-not-install-async-connect-send-test-td4695220.html-->
-
 
     <para><parameter>--enable-fhs</parameter>: Assigns all other file paths in
@@ -503,8 +485,8 @@
           libsamba-policy.so, libsamba-util.so, libsamdb.so,
           libsmbclient-raw.so, libsmbclient.so, libsmbconf.so, libsmbldap.so,
-          libtevent-util.so, libtorture.so, libwbclient.so, mit_samba.so, and
-          winbind_krb5_locator.so; the pam_winbind.so and pam_smbpass.so PAM
-          libraries; and assorted character set, filesystem and support modules
-          under /usr/lib/{python&python2-majorver;,samba}
+          libtevent-util.so, libtorture.so, libwbclient.so, <!--mit_samba.so,
+          --> and winbind_krb5_locator.so; the pam_winbind.so and pam_smbpass.so
+          PAM libraries; and assorted character set, filesystem and support
+          modules under /usr/lib/{python&python2-majorver;,samba}
         </seg>
 
Index: packages.ent
===================================================================
--- packages.ent	(revision ed4a7a25158650b74ecc19c65fe5821549a137d8)
+++ packages.ent	(revision dbcebcfcdd56256842c2a19791e7de5a2c0caf10)
@@ -165,5 +165,5 @@
 <!ENTITY giflib-version               "5.1.2">
 <!ENTITY graphite2-version            "1.3.3">
-<!ENTITY harfbuzz-version             "1.1.2">
+<!ENTITY harfbuzz-version             "1.1.3">
 <!ENTITY ijs-version                  "0.35">
 <!ENTITY jasper-version               "1.900.1">
@@ -259,5 +259,5 @@
 <!ENTITY dejagnu-version              "1.5.3">
 <!ENTITY doxygen-version              "1.8.11">
-<!ENTITY elfutils-version             "0.164">
+<!ENTITY elfutils-version             "0.165">
 <!ENTITY expect-version               "5.45">
 <!ENTITY gcc-version                  "5.3.0">
@@ -367,5 +367,5 @@
 <!ENTITY rpcbind-version              "0.2.3">
 <!ENTITY rsync-version                "3.1.2">
-<!ENTITY samba-version                "4.3.3">
+<!ENTITY samba-version                "4.3.4">
 <!ENTITY wget-version                 "1.17.1">
 <!ENTITY wireless-tools-version       "29">
Index: xfce/apps/apps.xml
===================================================================
--- xfce/apps/apps.xml	(revision ed4a7a25158650b74ecc19c65fe5821549a137d8)
+++ xfce/apps/apps.xml	(revision dbcebcfcdd56256842c2a19791e7de5a2c0caf10)
@@ -28,5 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfburn.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ristretto.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunique.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-notifyd.xml"/>
 
Index: ce/apps/libunique.xml
===================================================================
--- xfce/apps/libunique.xml	(revision ed4a7a25158650b74ecc19c65fe5821549a137d8)
+++ 	(revision )
@@ -1,190 +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 libunique-download-http "&gnome-download-http;/libunique/1.1/libunique-&libunique-version;.tar.bz2">
-  <!ENTITY libunique-download-ftp  "&gnome-download-ftp;/libunique/1.1/libunique-&libunique-version;.tar.bz2">
-  <!ENTITY libunique-md5sum        "7955769ef31f1bc4f83446dbb3625e6d">
-  <!ENTITY libunique-size          "328 KB">
-  <!ENTITY libunique-buildsize     "7.0 MB">
-  <!ENTITY libunique-time          "0.2 SBU">
-]>
-
-<sect1 id="libunique" xreflabel="libunique-&libunique-version;">
-  <?dbhtml filename="libunique.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libunique-&libunique-version;</title>
-
-  <indexterm zone="libunique">
-    <primary sortas="a-libunique">libunique</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libunique</title>
-
-    <para>
-      The <application>libunique</application> package contains a
-      library for writing single instance applications.
-    </para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libunique-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libunique-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libunique-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libunique-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libunique-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libunique-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libunique-&libunique-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libunique Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libunique"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libunique</title>
-
-    <para>
-      Install <application>libunique</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libunique-&libunique-version;-upstream_fixes-1.patch &amp;&amp;
-autoreconf -fi &amp;&amp;
-
-./configure --prefix=/usr  \
-            --disable-dbus \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </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>
-      <option>--disable-dbus</option>: This switch disables
-      <application>D-Bus</application> backend in favor of
-      the GDBus backend.
-    </para>
-
-    <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>
-          libunique-1.0.so
-        </seg>
-        <seg>
-          /usr/include/unique-1.0 and
-          /usr/share/gtk-doc/html/unique
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libunique-1">
-        <term><filename class="libraryfile">libunique-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libunique</application> API functions
-            for single instance support.
-          </para>
-          <indexterm zone="libunique libunique-1">
-            <primary sortas="c-libunique-1">libunique-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xfce/apps/midori.xml
===================================================================
--- xfce/apps/midori.xml	(revision ed4a7a25158650b74ecc19c65fe5821549a137d8)
+++ xfce/apps/midori.xml	(revision dbcebcfcdd56256842c2a19791e7de5a2c0caf10)
@@ -91,5 +91,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/> and
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="libunique"/> (if built with gtk+2) and
       <ulink url="https://launchpad.net/zeitgeist/0.9/">Zeitgeist</ulink>
     </para>
