Index: BOOK/boot/common/shadow.xml
===================================================================
--- BOOK/boot/common/shadow.xml	(revision f991c3d10994e4e14a78ddfde7c2046177932afa)
+++ BOOK/boot/common/shadow.xml	(revision a72db742e7f39bb166716c515af61c788116c380)
@@ -23,13 +23,11 @@
     <title>Installation of Shadow</title>
 
-    <para os="a">Run the following <command>sed</command> command to disable
-    the installation of the <command>groups</command> and
-    <command>nologin</command> programs, as better versions of these programs
-    are provided by other packages, and prevent Shadow from setting the suid
-    bit on its installed programs:</para>
+    <para os="a">Disable the installation of the <command>groups</command>
+    program and man pages, as better versions of these programs are provided by
+    Coreutils, Util-linux and Man-pages. Also, prevent Shadow from setting the
+    suid bit on its installed programs:</para>
 
 <screen os="b"><userinput>cp -v src/Makefile.in{,.orig}
 sed -e 's/groups$(EXEEXT) //' \
-    -e 's/= nologin$(EXEEXT)/= /' \
     -e 's/\(^suidu*bins = \).*/\1\\/' \
     src/Makefile.in.orig &gt; src/Makefile.in</userinput></screen>
Index: BOOK/final-system/common/shadow.xml
===================================================================
--- BOOK/final-system/common/shadow.xml	(revision f991c3d10994e4e14a78ddfde7c2046177932afa)
+++ BOOK/final-system/common/shadow.xml	(revision a72db742e7f39bb166716c515af61c788116c380)
@@ -40,14 +40,13 @@
     </note>
 
-    <para os="b">Disable the installation of the <command>groups</command> and
-    <command>nologin</command> programs and their man pages, as better versions
-    of these programs are provided by Coreutils and Util-linux:</para>
+    <para os="b">Disable the installation of the <command>groups</command>
+    program and man pages, as better versions of these programs are provided by
+    Coreutils, Util-linux and Man-pages:</para>
 
 <screen os="c"><userinput>sed -i src/Makefile.in \
-  -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /'
+  -e 's/groups$(EXEEXT) //'
 find man -name Makefile.in -exec sed -i \
   -e 's/man1\/groups\.1 //' \
   -e 's/man3\/getspnam\.3 //' \
-  -e 's/man8\/nologin\.8 //' \
   -e 's/man5\/passwd\.5 //' '{}' \;</userinput></screen>
 
@@ -174,5 +173,5 @@
         <seg>chage, chfn, chgpasswd, chpasswd, chsh, expiry, faillog, gpasswd,
         groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
-        lastlog, login, logoutd, newgrp, newusers, passwd, pwck,
+        lastlog, login, logoutd, newgrp, newusers, nologin, passwd, pwck,
         pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
         vigr (link to vipw), vipw</seg>
@@ -399,4 +398,15 @@
       </varlistentry>
 
+      <varlistentry id="nologin">
+        <term><command>nologin</command></term>
+        <listitem>
+          <para>Displays a message that an account is not available. It is
+          designed to be used as the default shell for disabled accounts.</para>
+          <indexterm zone="ch-system-shadow nologin">
+            <primary sortas="b-nologin">nologin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="passwd">
         <term><command>passwd</command></term>
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision f991c3d10994e4e14a78ddfde7c2046177932afa)
+++ BOOK/final-system/common/util-linux.xml	(revision a72db742e7f39bb166716c515af61c788116c380)
@@ -718,16 +718,4 @@
       </varlistentry>
 
-      <varlistentry id="nologin">
-        <term><command>nologin</command></term>
-        <listitem>
-          <para>Displays a message that an account is not available. Designed
-          to be used as the default shell for accounts that have been
-          disabled</para>
-          <indexterm zone="ch-system-util-linux nologin">
-            <primary sortas="b-nologin">nologin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="nsenter">
         <term><command>nsenter</command></term>
Index: BOOK/temp-system/common/util-linux.xml
===================================================================
--- BOOK/temp-system/common/util-linux.xml	(revision f991c3d10994e4e14a78ddfde7c2046177932afa)
+++ BOOK/temp-system/common/util-linux.xml	(revision a72db742e7f39bb166716c515af61c788116c380)
@@ -33,4 +33,5 @@
     --disable-makeinstall-chown \
     --disable-makeinstall-setuid \
+    --disable-nologin \
     --without-python</userinput></screen>
 
@@ -51,4 +52,12 @@
           <para>This prevents Util-linux from enabling the setuid bit on
           any of its installed programs.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--disable-nologin</parameter></term>
+        <listitem>
+          <para>This prevents Util-linux from installing
+          <command>nologin</command>.</para> 
         </listitem>
       </varlistentry>
Index: BOOK/temp-system/multilib/util-linux.xml
===================================================================
--- BOOK/temp-system/multilib/util-linux.xml	(revision f991c3d10994e4e14a78ddfde7c2046177932afa)
+++ BOOK/temp-system/multilib/util-linux.xml	(revision a72db742e7f39bb166716c515af61c788116c380)
@@ -34,4 +34,5 @@
     --disable-makeinstall-chown \
     --disable-makeinstall-setuid \
+    --disable-nologin \
     --without-python</userinput></screen>
 
