diff --git a/ChangeLog b/ChangeLog
index 0ae82f16..bb11c4fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-20  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/newusers.8.xml man/groupmems.8.xml man/groupdel.8.xml
+	man/useradd.8.xml man/groupadd.8.xml man/newgrp.1.xml man/sg.1.xml
+	man/chgpasswd.8.xml man/groupmod.8.xml: Tag the section which
+	require --enable-shadowgrp accordingly.
+
 2008-05-19  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/login.defs.5.xml: SHA_CRYPT_MAX_ROUNDS and
diff --git a/NEWS b/NEWS
index 15c3e03a..fb7e6c25 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,8 @@ shadow-4.1.1 -> shadow-4.1.2						UNRELEASED
 - Document the -c, --crypt-method and -s, --sha-rounds options in the
   newusers manpage.
 - Document the -k, --skel option in the useradd manpage.
+- Tag the section which require --enable-shadowgrp or --with-sha-crypt
+  accordingly.
 
 shadow-4.1.0 -> shadow-4.1.1						02-04-2008
 
diff --git a/man/chgpasswd.8.xml b/man/chgpasswd.8.xml
index f6887555..8959417e 100644
--- a/man/chgpasswd.8.xml
+++ b/man/chgpasswd.8.xml
@@ -153,7 +153,7 @@
 	  <para>Group account information.</para>
 	</listitem>
       </varlistentry>
-      <varlistentry>
+      <varlistentry condition="gshadow">
 	<term><filename>/etc/gshadow</filename></term>
 	<listitem>
 	  <para>Secure group account information.</para>
diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index 92b335ce..93037fbc 100644
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -168,7 +168,7 @@
 	  <para>Group account information.</para>
 	</listitem>
       </varlistentry>
-      <varlistentry>
+      <varlistentry condition="gshadow">
 	<term><filename>/etc/gshadow</filename></term>
 	<listitem>
 	  <para>Secure group account information.</para>
diff --git a/man/groupdel.8.xml b/man/groupdel.8.xml
index 4b2104dc..ad44f347 100644
--- a/man/groupdel.8.xml
+++ b/man/groupdel.8.xml
@@ -64,7 +64,7 @@
 	  <para>Group account information.</para>
 	</listitem>
       </varlistentry>
-      <varlistentry>
+      <varlistentry condition="gshadow">
 	<term><filename>/etc/gshadow</filename></term>
 	<listitem>
 	  <para>Secure group account information.</para>
diff --git a/man/groupmems.8.xml b/man/groupmems.8.xml
index 9c3a8eb9..9b917720 100644
--- a/man/groupmems.8.xml
+++ b/man/groupmems.8.xml
@@ -124,7 +124,7 @@
 	  <para>Group account information.</para>
 	</listitem>
       </varlistentry>
-      <varlistentry>
+      <varlistentry condition="gshadow">
 	<term><filename>/etc/gshadow</filename></term>
 	<listitem>
 	  <para>secure group account information</para>
diff --git a/man/groupmod.8.xml b/man/groupmod.8.xml
index 8b32c12d..65e50a81 100644
--- a/man/groupmod.8.xml
+++ b/man/groupmod.8.xml
@@ -126,7 +126,7 @@
 	  <para>Group account information.</para>
 	</listitem>
       </varlistentry>
-      <varlistentry>
+      <varlistentry condition="gshadow">
 	<term><filename>/etc/gshadow</filename></term>
 	<listitem>
 	  <para>Secure group account information.</para>
diff --git a/man/newgrp.1.xml b/man/newgrp.1.xml
index e34e3ae7..b79abb59 100644
--- a/man/newgrp.1.xml
+++ b/man/newgrp.1.xml
@@ -46,7 +46,7 @@
       is not listed as a member.
     </para>
 
-    <para>
+    <para condition="gshadow">
       If there is an entry for this group in
       <filename>/etc/gshadow</filename>, then the list of members and the
       password of this group will be taken from this file, otherwise, the
@@ -87,7 +87,7 @@
 	  <para>Group account information.</para>
 	 </listitem>
       </varlistentry>
-      <varlistentry>
+      <varlistentry condition="gshadow">
 	<term><filename>/etc/gshadow</filename></term>
 	<listitem>
 	  <para>Secure group account information.</para>
@@ -117,7 +117,7 @@
       <citerefentry>
 	<refentrytitle>group</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
-      <citerefentry>
+      <citerefentry condition="gshadow">
 	<refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>.
     </para>
diff --git a/man/newusers.8.xml b/man/newusers.8.xml
index 5b7486c8..b4cc2e35 100644
--- a/man/newusers.8.xml
+++ b/man/newusers.8.xml
@@ -214,7 +214,7 @@
 	  <para>Group account information.</para>
 	</listitem>
       </varlistentry>
-      <varlistentry>
+      <varlistentry condition="gshadow">
 	<term><filename>/etc/gshadow</filename></term>
 	<listitem>
 	  <para>Secure group account information.</para>
diff --git a/man/sg.1.xml b/man/sg.1.xml
index 4660fd55..b5efc99c 100644
--- a/man/sg.1.xml
+++ b/man/sg.1.xml
@@ -76,7 +76,7 @@
 	  <para>Group account information.</para>
 	 </listitem>
       </varlistentry>
-      <varlistentry>
+      <varlistentry condition="gshadow">
 	<term><filename>/etc/gshadow</filename></term>
 	<listitem>
 	  <para>Secure group account information.</para>
@@ -106,7 +106,7 @@
       <citerefentry>
 	<refentrytitle>group</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
-      <citerefentry>
+      <citerefentry condition="gshadow">
 	<refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>
     </para>
diff --git a/man/useradd.8.xml b/man/useradd.8.xml
index 2da9c304..883bbc4e 100644
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -510,6 +510,12 @@
 	  <para>Group account information.</para>
 	</listitem>
       </varlistentry>
+      <varlistentry condition="gshadow">
+	<term><filename>/etc/gshadow</filename></term>
+	<listitem>
+	  <para>Secure group account information.</para>
+	</listitem>
+      </varlistentry>
       <varlistentry>
 	<term><filename>/etc/default/useradd</filename></term>
 	<listitem>