diff --git a/ChangeLog b/ChangeLog
index f12b19ee..fc41df05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2009-05-25  Nicolas François  <nicolas.francois@centraliens.net>
 
-	* man/passwd.1.xml: Avoid a spurious comma.
+	* man/chpasswd.8.xml, man/grpck.8.xml, man/newgrp.1.xml,
+	man/passwd.1.xml, man/sg.1.xml: Avoid a spurious comma.
 
 2009-05-25  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/man/chpasswd.8.xml b/man/chpasswd.8.xml
index cca79639..732a4643 100644
--- a/man/chpasswd.8.xml
+++ b/man/chpasswd.8.xml
@@ -243,9 +243,11 @@
       <citerefentry>
 	<refentrytitle>newusers</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
-      <citerefentry condition="no_pam">
-	<refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
-      </citerefentry>,
+      <phrase condition="no_pam">
+	<citerefentry>
+	  <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+	</citerefentry>,
+      </phrase>
       <citerefentry>
 	<refentrytitle>useradd</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>.
diff --git a/man/grpck.8.xml b/man/grpck.8.xml
index 0e67439b..f96175d8 100644
--- a/man/grpck.8.xml
+++ b/man/grpck.8.xml
@@ -195,9 +195,11 @@
       <citerefentry>
 	<refentrytitle>groupmod</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
-      <citerefentry condition="gshadow">
-	<refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum>,
-      </citerefentry>
+      <phrase condition="gshadow">
+	<citerefentry>
+	  <refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum>,
+	</citerefentry>,
+      </phrase>
       <citerefentry>
 	<refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
diff --git a/man/newgrp.1.xml b/man/newgrp.1.xml
index 3afc5a79..a0d58405 100644
--- a/man/newgrp.1.xml
+++ b/man/newgrp.1.xml
@@ -145,10 +145,11 @@
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>group</refentrytitle><manvolnum>5</manvolnum>
-      </citerefentry>,
-      <citerefentry condition="gshadow">
-	<refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum>
-      </citerefentry>.
+      </citerefentry><phrase condition="gshadow">,
+	<citerefentry condition="gshadow">
+	  <refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum>
+	</citerefentry>
+      </phrase>.
     </para>
   </refsect1>
 </refentry>
diff --git a/man/sg.1.xml b/man/sg.1.xml
index f4d7c505..5a2d92a9 100644
--- a/man/sg.1.xml
+++ b/man/sg.1.xml
@@ -134,10 +134,11 @@
       </citerefentry>,
       <citerefentry>
 	<refentrytitle>group</refentrytitle><manvolnum>5</manvolnum>
-      </citerefentry>,
-      <citerefentry condition="gshadow">
-	<refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum>
-      </citerefentry>
+      </citerefentry><phrase condition="gshadow">,
+	<citerefentry>
+	  <refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum>
+	</citerefentry>
+      </phrase>.
     </para>
   </refsect1>
 </refentry>