diff --git a/gcloud/datastore/query.py b/gcloud/datastore/query.py
index 9c14d19b07dd..af489de59b9d 100644
--- a/gcloud/datastore/query.py
+++ b/gcloud/datastore/query.py
@@ -172,6 +172,14 @@ def kind(self, value):
 
         :type value: string
         :param value: updated kind for the query.
+
+        .. note::
+
+           The protobuf specification allows for ``kind`` to be repeated,
+           but the current implementation returns an error if more than
+           one value is passed.  If the back-end changes in the future to
+           allow multiple values, this method will be updated to allow passing
+           either a string or a sequence of strings.
         """
         if not isinstance(value, str):
             raise TypeError("Kind must be a string")