diff --git a/ChangeLog b/ChangeLog
index 59034efa..73c43254 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-23  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/groupadd.8.xml, configure.in, man/config.xml.in: Use the
+	real group name length limit in the documentation.
+
 2008-12-23  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/Makefile.am: Only link with the needed library. When
diff --git a/configure.in b/configure.in
index d9983180..ff2fdb83 100644
--- a/configure.in
+++ b/configure.in
@@ -264,6 +264,8 @@ elif test "$with_group_name_max_length" = "yes" ; then
 	with_group_name_max_length=16
 fi
 AC_DEFINE_UNQUOTED(GROUP_NAME_MAX_LENGTH, $with_group_name_max_length, [max group name length])
+AC_SUBST(GROUP_NAME_MAX_LENGTH)
+GROUP_NAME_MAX_LENGTH="$with_group_name_max_length"
 
 AM_CONDITIONAL(USE_SHA_CRYPT, test "x$with_sha_crypt" = "xyes")
 if test "$with_sha_crypt" = "yes"; then
@@ -481,6 +483,7 @@ AC_CONFIG_FILES([
 	po/Makefile.in
 	doc/Makefile
 	man/Makefile
+	man/config.xml
 	man/po/Makefile.in
 	man/cs/Makefile
 	man/de/Makefile
diff --git a/man/config.xml.in b/man/config.xml.in
new file mode 100644
index 00000000..322f619c
--- /dev/null
+++ b/man/config.xml.in
@@ -0,0 +1 @@
+<!ENTITY GROUP_NAME_MAX_LENGTH '@GROUP_NAME_MAX_LENGTH@'>
diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index a2e81dee..e440763b 100644
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -33,6 +33,8 @@
 <!ENTITY GID_MAX               SYSTEM "login.defs.d/GID_MAX.xml">
 <!ENTITY MAX_MEMBERS_PER_GROUP SYSTEM "login.defs.d/MAX_MEMBERS_PER_GROUP.xml">
 <!ENTITY SYS_GID_MAX           SYSTEM "login.defs.d/SYS_GID_MAX.xml">
+<!ENTITY % config SYSTEM "config.xml">
+%config;
 ]>
 <refentry id='groupadd.8'>
   <!-- $Id$ -->
@@ -215,7 +217,7 @@
        may follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]?
      </para>
      <para>
-       Groupnames may only be up to 16 characters long.
+       Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long.
      </para>
      <para>
        You may not add a NIS or LDAP group. This must be performed on the