Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision b0424f71c46d644a69c9717c33b44fad8fa9c859)
+++ chapter01/changelog.xml	(revision c4dcfd8bb659776d4c91345481f22396186b817e)
@@ -37,4 +37,20 @@
 -->
     <listitem>
+      <para>2016-03-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Prevent attr and shadow from overwriting
+          man pages installed by the man-pages package - Merged from
+          trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Retain flex static library for automake
+          regression tests.  Remove at the end of Chapter 6 - Merged from
+          trunk.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2016-02-19</para>
       <itemizedlist>
Index: chapter06/attr.xml
===================================================================
--- chapter06/attr.xml	(revision b0424f71c46d644a69c9717c33b44fad8fa9c859)
+++ chapter06/attr.xml	(revision c4dcfd8bb659776d4c91345481f22396186b817e)
@@ -50,5 +50,5 @@
     the <xref linkend="man-pages"/> package:</para>
 
-<screen><userinput remap="pre">sed -i -e "/SUBDIRS/s|man2||" man/Makefile</userinput></screen>
+<screen><userinput remap="pre">sed -i -e "/SUBDIRS/s|man[25]||g" man/Makefile</userinput></screen>
 
     <para>Prepare Attr for compilation:</para>
Index: chapter06/flex.xml
===================================================================
--- chapter06/flex.xml	(revision b0424f71c46d644a69c9717c33b44fad8fa9c859)
+++ chapter06/flex.xml	(revision c4dcfd8bb659776d4c91345481f22396186b817e)
@@ -44,7 +44,5 @@
     <para>Prepare Flex for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para>Compile the package:</para>
Index: chapter06/revisedchroot.xml
===================================================================
--- chapter06/revisedchroot.xml	(revision b0424f71c46d644a69c9717c33b44fad8fa9c859)
+++ chapter06/revisedchroot.xml	(revision c4dcfd8bb659776d4c91345481f22396186b817e)
@@ -44,5 +44,5 @@
   <para>Finally, there were several static libraries that were not supressed earlier
   in the chapter in order to satisfy the regression tests in several packages. These 
-  libraries are from binutils, bzip2, e2fsprogs, <!--flex,--> libtool, and zlib.  If desired,
+  libraries are from binutils, bzip2, e2fsprogs, flex, libtool, and zlib.  If desired,
   remove them now:</para>
 
@@ -51,7 +51,7 @@
 rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
 rm -f /usr/lib/libltdl.a
+rm -f /usr/lib/libfl.a
+rm -f /usr/lib/libfl_pic.a
 rm -f /usr/lib/libz.a</userinput></screen>
 
-<!-- Flex shared library is broken. Keep static until next flex release. -->
-
 </sect1>
Index: chapter06/shadow.xml
===================================================================
--- chapter06/shadow.xml	(revision b0424f71c46d644a69c9717c33b44fad8fa9c859)
+++ chapter06/shadow.xml	(revision c4dcfd8bb659776d4c91345481f22396186b817e)
@@ -51,8 +51,12 @@
 
     <para>Disable the installation of the <command>groups</command> program
-    and its man pages, as Coreutils provides a better version:</para>
+    and its man pages, as Coreutils provides a better version. Also 
+    Prevent the installation of manual pages that were already installed by the
+    <xref linkend="man-pages"/> package:</para>
 
 <screen><userinput remap="pre">sed -i 's/groups$(EXEEXT) //' src/Makefile.in
-find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></screen>
+find man -name Makefile.in -exec sed -i 's/groups\.1 / /'   {} \;
+find man -name Makefile.in -exec sed -i 's/getspnam\.3 / /' {} \;
+find man -name Makefile.in -exec sed -i 's/passwd\.5 / /'   {} \;</userinput></screen>
 
     <para id="shadow-login_defs">Instead of using the default
Index: general.ent
===================================================================
--- general.ent	(revision b0424f71c46d644a69c9717c33b44fad8fa9c859)
+++ general.ent	(revision c4dcfd8bb659776d4c91345481f22396186b817e)
@@ -1,5 +1,5 @@
-<!ENTITY version         "20160219-systemd">
+<!ENTITY version         "20160304-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "February 19, 2016">
+<!ENTITY releasedate     "March 04, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.9">
