diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h
index 688f2d3a..8f62279d 100644
--- a/src/ngircd/defines.h
+++ b/src/ngircd/defines.h
@@ -44,10 +44,10 @@
 					   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 9		/* Max. lenth of all client modes */
+#define CLIENT_MODE_LEN 16		/* Max. lenth of all client modes */
 #define CLIENT_INFO_LEN 64		/* Max. length of server info texts */
 #define CLIENT_AWAY_LEN 128		/* Max. length of away messages */
-#define CLIENT_FLAGS_LEN 100		/* Max. length of client flags */
+#define CLIENT_FLAGS_LEN 16		/* Max. length of client flags */
 
 #define CHANNEL_NAME_LEN 51		/* Max. length of a channel name, see
 					   RFC 2812 section 1.3 */