diff --git a/ChangeLog b/ChangeLog
index a8c4a61f..b671f8f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 2008-08-15  Nicolas François  <nicolas.francois@centraliens.net>
 
-	* man/po/pl.po: Fix typo inthe Polish translation (see
+	* man/groupadd.8.xml: Fix the regular expression for group policy.
+	The final $ character is optional.
+	* man/groupadd.8.xml: Likewise.
+	* man/groupadd.8.xml: Indicate the maximum size of usernames.
+
+2008-08-15  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/po/pl.po: Fix typo in the Polish translation (see
 	http://bugs.debian.org/491460)
 
 2008-08-13  Nicolas François  <nicolas.francois@centraliens.net>
diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index 93037fbc..04f7aec1 100644
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -188,7 +188,7 @@
      <para>
        Groupnames must begin with a lower case letter or an underscore,
        and only lower case letters, underscores, dashes, and dollar signs
-       may follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]
+       may follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]?
      </para>
      <para>
        Groupnames may only be up to 16 characters long.
diff --git a/man/useradd.8.xml b/man/useradd.8.xml
index 883bbc4e..6c330ca4 100644
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -463,7 +463,10 @@
     <para>
       Usernames must begin with a lower case letter or an underscore, and
       only lower case letters, underscores, dashes, and dollar signs may
-      follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]
+      follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]?
+    </para>
+    <para>
+      Usernames may only be up to 32 characters long.
     </para>
   </refsect1>