diff --git a/ChangeLog b/ChangeLog
index e726a123..ebf0ed3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
 
 ngIRCd 0.9.x
 
+  - Fixed maximum length of user names, now allow up to 9 characters.
   - Cut off oversized IRC messages that should be sent to the network instead
     of shuttding down the (wrong) connection.
   - Don't generate error messages for unknown commands received before the
@@ -610,4 +611,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.276.2.2 2005/07/02 14:45:07 alex Exp $
+$Id: ChangeLog,v 1.276.2.3 2005/07/05 22:58:25 alex Exp $
diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h
index 469136e0..59cb0d1e 100644
--- a/src/ngircd/defines.h
+++ b/src/ngircd/defines.h
@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: defines.h,v 1.52.2.1 2005/07/02 14:44:36 alex Exp $
+ * $Id: defines.h,v 1.52.2.2 2005/07/05 22:58:25 alex Exp $
  *
  * Global defines of ngIRCd.
  */
@@ -43,7 +43,8 @@
 #define CLIENT_ID_LEN 64		/* max. length of an IRC ID; see RFC 2812, 1.1 and 1.2.1 */
 #define CLIENT_NICK_LEN 10		/* max. nick length; see. RFC 2812, 1.2.1 */
 #define CLIENT_PASS_LEN 21		/* max. password length */
-#define CLIENT_USER_LEN 9		/* max. length of user name ("login") */
+#define CLIENT_USER_LEN 10		/* Max. length of user name ("login")
+ 					   see RFC 2812, section 1.2.1 */
 #define CLIENT_NAME_LEN 32		/* max. length of "real names" */
 #define CLIENT_HOST_LEN 64		/* max. host name length */
 #define CLIENT_MODE_LEN 8		/* max. lenth of all client modes */