diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index a1860fa2e..a1eb3f1b4 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1081,6 +1081,42 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Libpipeline dependency info -->
+  <bridgehead renderas="sect2" id="libpipeline-dep">Libpipeline</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
+         Make, Sed, and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Man-DB</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&external;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Libtool dependency info -->
   <bridgehead renderas="sect2" id="libtool-dep">Libtool</bridgehead>
 
@@ -1233,7 +1269,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Bzip2, Coreutils, Flex, GCC, GDBM, Gettext,
-         Glibc, Grep, Groff, Gzip, Less, Make, Sed, and Xz</seg>
+         Glibc, Grep, Groff, Gzip, Less, Libpipeline, Make, Sed, and Xz</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index fbdd3efb4..641c297c8 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,11 @@
     <listitem>
       <para>2011-04-18</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Man-DB-2.6.0.2, including adding its
+          dependency, libpipeline-1.2.0. Fixes
+          <ulink url="&lfs-ticket-root;2857">#2857</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Less-443. Fixes
           <ulink url="&lfs-ticket-root;2856">#2856</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 8445826aa..356aa4fd8 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -118,6 +118,9 @@
     <!--<listitem>
       <para>LFS-Bootscripts &lfs-bootscripts-version;</para>
     </listitem>-->
+    <!--<listitem>
+      <para>Libpipeline &libpipeline-version;</para>
+    </listitem>-->
     <!--<listitem>
       <para>Libtool &libtool-version;</para>
     </listitem>-->
@@ -130,9 +133,9 @@
     <!--<listitem>
       <para>Make &make-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Man-DB &man-db-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Man-pages &man-pages-version;</para>
     </listitem>-->
@@ -230,6 +233,9 @@
     <listitem>
       <para>&gcc-crosscompile-patch;</para>
     </listitem>
+    <listitem>
+      <para>libpipeline-&libpipeline-version;</para>
+    </listitem>
     <listitem>
       <para>readline-&readline-version;-fixes-1.patch</para>
     </listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index e78c69535..4f7b91934 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -293,6 +293,15 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Libpipeline (&libpipeline-version;) - <token>&libpipeline-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&libpipeline-home;"/></para>
+        <para>Download: <ulink url="&libpipeline-url;"/></para>
+        <para>MD5 sum: <literal>&libpipeline-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Libtool (&libtool-version;) - <token>&libtool-size;</token>:</term>
       <listitem>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 56f9e6a0c..691c1a9ea 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -59,6 +59,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
diff --git a/packages.ent b/packages.ent
index a5d05e06b..8c4fc3864 100644
--- a/packages.ent
+++ b/packages.ent
@@ -297,6 +297,14 @@
 <!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB"> <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
 
+<!ENTITY libpipeline-version "1.2.0">
+<!ENTITY libpipeline-size "670 KB">
+<!ENTITY libpipeline-url "http://download.savannah.gnu.org/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
+<!ENTITY libpipeline-md5 "dd3a987a0d2b594716baee2f73d61ae3">
+<!ENTITY libpipeline-home "http://libpipeline.nongnu.org/">
+<!ENTITY libpipeline-ch6-du "8.0 MB">
+<!ENTITY libpipeline-ch6-sbu "0.1 SBU">
+
 <!ENTITY libtool-version "2.4">
 <!ENTITY libtool-size "2,520 KB">
 <!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.gz">
@@ -342,10 +350,10 @@
 <!ENTITY make-ch6-du "9.7 MB">
 <!ENTITY make-ch6-sbu "0.3 SBU">
 
-<!ENTITY man-db-version "2.5.9">
-<!ENTITY man-db-size "2,312 KB">
+<!ENTITY man-db-version "2.6.0.2">
+<!ENTITY man-db-size "2,322 KB">
 <!ENTITY man-db-url "http://download.savannah.gnu.org/releases/man-db/man-db-&man-db-version;.tar.gz">
-<!ENTITY man-db-md5 "9841394f5c5fe7e2dd2e0c5fb4766d0f">
+<!ENTITY man-db-md5 "2b41c96efec032d2b74ccbf2e401f93e">
 <!ENTITY man-db-home "http://www.nongnu.org/man-db/">
 <!ENTITY man-db-ch6-du "22 MB">
 <!ENTITY man-db-ch6-sbu "0.4 SBU">