diff --git a/cqlengine/connection.py b/cqlengine/connection.py
index ecd3edd8..f6e25e4e 100644
--- a/cqlengine/connection.py
+++ b/cqlengine/connection.py
@@ -67,7 +67,7 @@ def setup(
     :type default_keyspace: str
     :param consistency: The global consistency level
     :type consistency: str
-    :param timeout: The connection timeout in seconds
+    :param timeout: The connection timeout in milliseconds
     :type timeout: int or long
 
     """
diff --git a/docs/topics/connection.rst b/docs/topics/connection.rst
index c956b58f..61405847 100644
--- a/docs/topics/connection.rst
+++ b/docs/topics/connection.rst
@@ -25,7 +25,7 @@ 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
+    :param timeout: the connection timeout in milliseconds
     :type timeout: int or long
 
     Records the hosts and connects to one of them