diff --git a/irc/config.go b/irc/config.go
index 9e9cb877..c856f6a5 100644
--- a/irc/config.go
+++ b/irc/config.go
@@ -1589,7 +1589,7 @@ func (config *Config) generateISupport() (err error) {
 	isupport.Add("CHANLIMIT", fmt.Sprintf("%s:%d", chanTypes, config.Channels.MaxChannelsPerClient))
 	isupport.Add("CHANMODES", chanmodesToken)
 	if config.History.Enabled && config.History.ChathistoryMax > 0 {
-		isupport.Add("draft/CHATHISTORY", strconv.Itoa(config.History.ChathistoryMax))
+		isupport.Add("CHATHISTORY", strconv.Itoa(config.History.ChathistoryMax))
 	}
 	isupport.Add("CHANNELLEN", strconv.Itoa(config.Limits.ChannelLen))
 	isupport.Add("CHANTYPES", chanTypes)
diff --git a/irctest b/irctest
index dbdadec6..35d342a4 160000
--- a/irctest
+++ b/irctest
@@ -1 +1 @@
-Subproject commit dbdadec6770a47e8a70578b8b7d8b61879bd9cb7
+Subproject commit 35d342a478f8ddc7d6b9ba7b2e55f769c60478d1