diff --git a/changelog b/changelog
index ac3d1a64..21d31aa7 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,8 @@
 CHANGELOG
 
+0.8.5
+* adding support for timeouts
+
 0.8.4
 * changing value manager previous value copying to deepcopy
 
diff --git a/cqlengine/VERSION b/cqlengine/VERSION
index b60d7196..7ada0d30 100644
--- a/cqlengine/VERSION
+++ b/cqlengine/VERSION
@@ -1 +1 @@
-0.8.4
+0.8.5
diff --git a/docs/topics/connection.rst b/docs/topics/connection.rst
index 88f601fb..c956b58f 100644
--- a/docs/topics/connection.rst
+++ b/docs/topics/connection.rst
@@ -25,6 +25,9 @@ If there is a problem with one of the servers, cqlengine will try to connect to
     :param consistency: the consistency level of the connection, defaults to 'ONE'
     :type consistency: str
 
+    :param timeout: the connection timeout in seconds
+    :type timeout: int or long
+
     Records the hosts and connects to one of them
 
 See the example at :ref:`getting-started`