diff --git a/ChangeLog b/ChangeLog
index 1162c9d0..1c9de511 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
 
 ngIRCd CVSHEAD
 
+  - Raised the maximum length of passwords to 20 characters.
   - Fixed a memory leak when resizing the connection pool and realloc()
     failed. Now we don't fall back to malloc(), which should be sane anyway.
     Patch from Florian Westphal, <westphal@foo.fh-furtwangen.de>.
@@ -556,4 +557,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.249 2005/01/17 11:57:39 alex Exp $
+$Id: ChangeLog,v 1.250 2005/01/17 13:01:34 alex Exp $
diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h
index 34951aee..214b037c 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.46 2004/05/07 11:19:21 alex Exp $
+ * $Id: defines.h,v 1.47 2005/01/17 13:01:34 alex Exp $
  *
  * Global defines of ngIRCd.
  */
@@ -39,7 +39,7 @@
 
 #define CLIENT_ID_LEN 64		/* max. ID-Laenge; vgl. RFC 2812, 1.1 und 1.2.1 */
 #define CLIENT_NICK_LEN 10		/* max. Nick-Laenge; vgl. RFC 2812, 1.2.1 */
-#define CLIENT_PASS_LEN 9		/* max. Laenge des Passwortes */
+#define CLIENT_PASS_LEN 21		/* max. Laenge des Passwortes */
 #define CLIENT_USER_LEN 9		/* max. Laenge des Benutzernamen ("Login") */
 #define CLIENT_NAME_LEN 32		/* max. Laenge des "langen Benutzernamen" */
 #define CLIENT_HOST_LEN 64		/* max. Laenge des Hostname */