diff --git a/ChangeLog b/ChangeLog
index f9441b6e..63e3a306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-18  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/groupadd.8.xml, man/useradd.8.xml: names may also contain
+	digits.
+
 2009-05-18  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/shadow.5.xml: What is important in shadow is not the
diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index 5d978236..a44e152f 100644
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -217,9 +217,10 @@
    <refsect1 id='caveats'>
      <title>CAVEATS</title>
      <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_-]*[$]?
+       Groupnames must start with a lower case letter or an underscore,
+       followed by lower case letters, digits, underscores, or dashes.
+       They can end with a dollar sign.
+       In regular expression terms: [a-z_][a-z0-9_-]*[$]?
      </para>
      <para>
        Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long.
diff --git a/man/useradd.8.xml b/man/useradd.8.xml
index 5e682b7c..4965009e 100644
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -601,9 +601,10 @@
     </para>
 
     <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_-]*[$]?
+      Usernames must start with a lower case letter or an underscore,
+      followed by lower case letters, digits, underscores, or dashes.
+      They can end with a dollar sign.
+      In regular expression terms: [a-z_][a-z0-9_-]*[$]?
     </para>
     <para>
       Usernames may only be up to 32 characters long.