diff --git a/src/eggdrop.h b/src/eggdrop.h
index c91ae91e2..3f8de5d7f 100644
--- a/src/eggdrop.h
+++ b/src/eggdrop.h
@@ -49,9 +49,10 @@
  *       You should leave this at 32 characters and modify nick-len in the
  *       configuration file instead.
  */
-#define CHANNELLEN 80 /* FIXME see issue #3 and issue #38 and rfc1459 <= 200 */
-#define HANDLEN    32 /* valid values 9->NICKMAX                             */
-#define NICKMAX    32 /* valid values HANDLEN->32                            */
+#define CHANNELLEN 200 /* rfc1459 defines "Channels names are strings [...]
+                        * of length up to 200 characters.                   */
+#define HANDLEN    32  /* valid values 9->NICKMAX                           */
+#define NICKMAX    32  /* valid values HANDLEN->32                          */
 #define USERLEN    10