diff --git a/configure.ac b/configure.ac
index a6e1b45f..c5e01009 100644
--- a/configure.ac
+++ b/configure.ac
@@ -893,7 +893,7 @@ dnl so enable small net unless you really need this much support
 fi
 
 AC_ARG_WITH(nicklen,
-AC_HELP_STRING([--with-nicklen=LENGTH],[Set the upper-bound nick length to LENGTH (default 50, max 50)]),
+AC_HELP_STRING([--with-nicklen=LENGTH],[Set the upper-bound nick length to LENGTH (default 31, max 50)]),
 [
   if ! expr "$withval" + 0 >/dev/null 2>&1; then 
 	AC_ERROR([NICKLEN must be a numeric value])
@@ -904,7 +904,7 @@ AC_HELP_STRING([--with-nicklen=LENGTH],[Set the upper-bound nick length to LENGT
   else
 	NICKLEN="$withval"
   fi
-], [NICKLEN=50])
+], [NICKLEN=31])
 
 AC_ARG_WITH(topiclen,           
 AC_HELP_STRING([--with-topiclen=NUMBER],[Set the max topic length to NUMBER (default 390, max 390)]),
diff --git a/doc/example.conf b/doc/example.conf
index bbc44012..69c894f6 100755
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -81,7 +81,9 @@ serverinfo {
 	 */
 	default_max_clients = 1024;
 
-	/* nicklen: enforced nickname length (for this server only; must be 50 or smaller) */
+	/* nicklen: enforced nickname length (for this server only; must not
+	 * be longer than the maximum length set while building).
+	 */
 	nicklen = 30;
 };
 
diff --git a/doc/reference.conf b/doc/reference.conf
index 332f5cea..c0431fa3 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -161,7 +161,9 @@ serverinfo {
 	 */
 	default_max_clients = 1024;
 
-	/* nicklen: enforced nickname length (for this server only; must be 50 or smaller) */
+	/* nicklen: enforced nickname length (for this server only; must not
+	 * be longer than the maximum length set while building).
+	 */
 	nicklen = 30;
 };