diff --git a/discord/channel.py b/discord/channel.py
index a3e433e04..74d740016 100644
--- a/discord/channel.py
+++ b/discord/channel.py
@@ -59,6 +59,9 @@ class Channel(object):
     """
 
     def __init__(self, **kwargs):
+        self.update(**kwargs)
+
+    def update(self, **kwargs):
         self.name = kwargs.get('name')
         self.server = kwargs.get('server')
         self.id = kwargs.get('id')
diff --git a/discord/client.py b/discord/client.py
index 2df742f53..50ded4562 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -114,6 +114,7 @@ class Client(object):
             'on_status': _null_event,
             'on_channel_delete': _null_event,
             'on_channel_create': _null_event,
+            'on_channel_update': _null_event,
             'on_member_join': _null_event,
             'on_member_remove': _null_event,
             'on_member_update': _null_event,
@@ -265,6 +266,13 @@ class Client(object):
                 channel = utils.find(lambda c: c.id == channel_id, server.channels)
                 server.channels.remove(channel)
                 self._invoke_event('on_channel_delete', channel)
+        elif event == 'CHANNEL_UPDATE':
+            server = self._get_server(data.get('guild_id'))
+            if server is not None:
+                channel_id = data.get('id')
+                channel = utils.find(lambda c: c.id == channel_id, server.channels)
+                channel.update(server=server, **data)
+                self._invoke_event('on_channel_update', channel)
         elif event == 'CHANNEL_CREATE':
             is_private = data.get('is_private', False)
             channel = None
diff --git a/docs/api.rst b/docs/api.rst
index ccd27f2ed..ef3247fc0 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -86,6 +86,12 @@ All events are 'sandboxed', in that if an exception is thrown while the event is
 
     :param channel: The :class:`Channel` that got added or deleted.
 
+.. function:: on_channel_update(channel)
+
+    Called whenever a channel is updated. e.g. changed name, topic, permissions.
+
+    :param channel: The :class:`Channel` that got updated.
+
 .. function:: on_member_join(member)
               on_member_remove(member)