diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6c66012e1..02d0484c6 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2012-05-30</para>
       <itemizedlist>
+         <listitem>
+           <para>[matthew] - Correct the location of various package's man
+           pages. Fixes <ulink url="&lfs-ticket-root;3097">#3097</ulink>.</para>
+         </listitem>
          <listitem>
            <para>[matthew] - Upgrade to Util-Linux-2.21.2. Fixes
            <ulink url="&lfs-ticket-root;3100">#3100</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 63e516854..e40a7950d 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -169,9 +169,9 @@
     <!--<listitem>
       <para>Sed &sed-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Shadow &shadow-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Sysklogd &sysklogd-version;</para>
     </listitem>-->
@@ -300,6 +300,10 @@
       <para>perl-5.14.2-security-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>shadow-4.1.5-nscd-1.patch</para>
+    </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 1ef365a64..54f22b502 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -163,14 +163,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Shadow nscd Patch - <token>&shadow-nscd-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&shadow-nscd-patch;"/></para>
-        <para>MD5 sum: <literal>&shadow-nscd-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <!--<varlistentry>
       <term>Zlib fPIC Patch - <token>&zlib-fpic-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index 97840c588..32b5a2d2b 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -51,6 +51,10 @@
 
 <screen><userinput remap="pre">sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile</userinput></screen>
 
+    <para>Ensure the man pages are installed into the correct location:</para>
+
+<screen><userinput remap="pre">sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile</userinput></screen>
+
     <para>Prepare Bzip2 for compilation with:</para>
 
 <screen><userinput remap="make">make -f Makefile-libbz2_so
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 60604be63..d3da0d7bd 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -53,7 +53,8 @@
 
     <para>Prepare Ncurses for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --with-shared --without-debug --enable-widec</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --mandir=/usr/share/man --with-shared \
+            --without-debug --enable-widec</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure option:</title>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 8dd1930e7..6c7e8afcd 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -49,12 +49,6 @@
       command below.</para>
     </note>
 
-    <para>Apply a patch to fix an issue when running various programs from this
-    package when they are used when the <command>nscd</command> daemon is not
-    running:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&shadow-nscd-patch;</userinput></screen>
-
     <para>Disable the installation of the <command>groups</command> program
     and its man pages, as Coreutils provides a better version:</para>
 
diff --git a/packages.ent b/packages.ent
index 8b187b30d..68b1141c5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -463,10 +463,10 @@
 <!ENTITY sed-ch6-du "8.3 MB">
 <!ENTITY sed-ch6-sbu "0.2 SBU">
 
-<!ENTITY shadow-version "4.1.5">
-<!ENTITY shadow-size "2,105 KB">
+<!ENTITY shadow-version "4.1.5.1">
+<!ENTITY shadow-size "2,142 KB">
 <!ENTITY shadow-url "http://pkg-shadow.alioth.debian.org/releases/shadow-&shadow-version;.tar.bz2">
-<!ENTITY shadow-md5 "d5f7a588fadb79faeb4b08b1eee82e9a">
+<!ENTITY shadow-md5 "a00449aa439c69287b6d472191dc2247">
 <!ENTITY shadow-home "http://pkg-shadow.alioth.debian.org/">
 <!ENTITY shadow-ch6-du "30 MB">
 <!ENTITY shadow-ch6-sbu "0.3 SBU">
diff --git a/patches.ent b/patches.ent
index a710a4f90..a2cd134f1 100644
--- a/patches.ent
+++ b/patches.ent
@@ -99,11 +99,6 @@
 <!ENTITY readline-fixes-patch-size "1.3 KB">
 
 
-<!ENTITY shadow-nscd-patch "shadow-&shadow-version;-nscd-1.patch">
-<!ENTITY shadow-nscd-patch-md5 "6fd6a209c1aa623bad913fcff20b7d8e">
-<!ENTITY shadow-nscd-patch-size "1.1 KB">
-
-
 <!ENTITY tar-overflow-patch "tar-&tar-version;-overflow_fix-1.patch">
 <!ENTITY tar-overflow-patch-md5 "1912ec36d2a0e2b96678651cf583ce6f">
 <!ENTITY tar-overflow-patch-size "1.7 KB">