diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3e3a151e..910f4189 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,12 @@
+1.1.2
+=====
+In Progress
+
+Bug Fixes
+---------
+* Update token metadata (for TokenAware calculations) when a node is removed
+  from the ring
+
 1.1.1
 =====
 April 16, 2014
diff --git a/cassandra/cluster.py b/cassandra/cluster.py
index 58c928d9..bb34a947 100644
--- a/cassandra/cluster.py
+++ b/cassandra/cluster.py
@@ -765,6 +765,7 @@ class Cluster(object):
             session.on_remove(host)
         for listener in self.listeners:
             listener.on_remove(host)
+        self.control_connection.on_remove(host)
 
     def signal_connection_failure(self, host, connection_exc, is_host_addition):
         is_down = host.signal_connection_failure(connection_exc)