diff --git a/Changelog b/Changelog
index 62c8b0c..8c435e7 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
 [Changes 1.2.2]
 
+* Bump MAXPARA (maximum protocol message arguments) to 20 as per EPIC5. (caf)
+
 * Correctly handle a last argument prefixed with : for any protocol message,
   for compatibility with inspircd.  Reported by trn. (caf)
 
diff --git a/include/parse.h b/include/parse.h
index 564aad7..4221d3b 100644
--- a/include/parse.h
+++ b/include/parse.h
@@ -44,7 +44,7 @@ extern	int	doing_privmsg;
 #define WAIT_BANS 1
 #define WAIT_MODE 2
 
-#define MAXPARA 15
+#define MAXPARA 20	/* RFC1459 says 15+1, but RusNet uses more */
 
 
 #endif /* PARSE_H_ */