diff --git a/src/irclib.py b/src/irclib.py
index 0efa1abc8..10112e573 100644
--- a/src/irclib.py
+++ b/src/irclib.py
@@ -401,6 +401,15 @@ class IrcState(IrcCommandDispatcher):
         """Returns the hostmask for a given nick."""
         return self.nicksToHostmasks[nick]
 
+    def do004(self, irc, msg):
+        """Handles parsing the 004 reply
+
+        Supported user and channel modes are cached"""
+        # msg.args = [nick, server, ircd-version, umodes, modes,
+        #             modes that require arguments? (non-standard)]
+        self.supported['umodes'] = msg.args[3]
+        self.supported['chanmodes'] = msg.args[4]
+
     _005converters = utils.InsensitivePreservingDict({
         'modes': int,
         'keylen': int,