-#define RPL_YOURHOST_MSG "002 %s :Your host is %s, running ngircd %s-%s/%s/%s"
-#define RPL_CREATED_MSG "003 %s :This server was started %s"
-#define RPL_MYINFO_MSG "004 %s :%s ngircd-%s %s %s"
-#define RPL_UMODEIS_MSG "211 %s +%s"
-#define RPL_LUSERCLIENT_MSG "251 %s :There are %d users and %d services on %d servers"
-#define RPL_LUSEROP_MSG "252 %s %d :operator(s) online"
-#define RPL_LUSERUNKNOWN_MSG "253 %s %d :unknown connection(s)"
-#define RPL_LUSERCHANNELS_MSG "254 %s %d :channels formed"
-#define RPL_LUSERME_MSG "255 %s :I have %d users, %d services and %d servers"
+#define RPL_YOURHOST_MSG "002 %s :Your host is %s, running version ngircd-%s (%s/%s/%s)"
+#define RPL_CREATED_MSG "003 %s :This server has been started %s"
+#define RPL_MYINFO_MSG "004 %s %s ngircd-%s %s %s"
+#define RPL_ISUPPORT1_MSG "005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=bI,k,l,imnPst CHANLIMIT=#&+:%d :are supported on this server"
+#define RPL_ISUPPORT2_MSG "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d PENALTY :are supported on this server"
+
+#define RPL_TRACELINK_MSG "200 %s Link %s-%s %s %s V%s %ld %d %d"
+#define RPL_TRACEOPERATOR_MSG "204 %s Oper 2 :%s"
+#define RPL_TRACESERVER_MSG "206 %s Serv 1 0S 0C %s[%s@%s] *!*@%s :V%s"
+#define RPL_STATSLINKINFO_MSG "211 %s %s %d %ld %ld %ld %ld :%ld"
+#define RPL_STATSCOMMANDS_MSG "212 %s %s %ld %ld %ld"
+#define RPL_ENDOFSTATS_MSG "219 %s %c :End of STATS report"
+#define RPL_UMODEIS_MSG "221 %s +%s"
+#define RPL_SERVLIST_MSG "234 %s %s %s %s %d %d :%s"
+#define RPL_SERVLISTEND_MSG "235 %s %s %s :End of service listing"
+
+#define RPL_STATSUPTIME "242 %s :Server Up %u days %u:%02u:%02u"
+#define RPL_LUSERCLIENT_MSG "251 %s :There are %ld users and %ld services on %ld servers"
+#define RPL_LUSEROP_MSG "252 %s %lu :operator(s) online"
+#define RPL_LUSERUNKNOWN_MSG "253 %s %lu :unknown connection(s)"
+#define RPL_LUSERCHANNELS_MSG "254 %s %lu :channels formed"
+#define RPL_LUSERME_MSG "255 %s :I have %lu users, %lu services and %lu servers"
+#define RPL_ADMINME_MSG "256 %s %s :Administrative info"
+#define RPL_ADMINLOC1_MSG "257 %s :%s"
+#define RPL_ADMINLOC2_MSG "258 %s :%s"
+#define RPL_ADMINEMAIL_MSG "259 %s :%s"
+#define RPL_TRACEEND_MSG "262 %s %s %s-%s.%s :End of TRACE"
+#define RPL_LOCALUSERS_MSG "265 %s %lu %lu :Current local users: %lu, Max: %lu"
+#define RPL_NETUSERS_MSG "266 %s %lu %lu :Current global users: %lu, Max: %lu"
+#define RPL_STATSCONN_MSG "250 %s :Highest connection count: %lu (%lu connections received)"
+#define RPL_WHOISSSL_MSG "275 %s %s :is connected via SSL (secure link)"