diff --git a/asyncio_mongo/protocol.py b/asyncio_mongo/protocol.py
index 1ea5f83..cca62c8 100644
--- a/asyncio_mongo/protocol.py
+++ b/asyncio_mongo/protocol.py
@@ -23,6 +23,10 @@ from asyncio_mongo.log import logger
 
 _ONE = b"\x01\x00\x00\x00"
 _ZERO = b"\x00\x00\x00\x00"
+_QUERY_OPTIONS = {
+    "tailable_cursor": 2,
+    "oplog_replay": 8,
+    "await_data": 32}
 
 """Low level connection to Mongo."""
 
@@ -163,14 +167,22 @@ class MongoProtocol(asyncio.Protocol):
         message = struct.pack("<iq", limit, cursor_id)
         self.send_message(2005, collection, message)
 
-    def OP_QUERY(self, collection, spec, skip, limit, fields=None):
+    def OP_QUERY(self, collection, spec, skip, limit, fields=None,
+                 tailable=False, await_data=False):
         message = struct.pack("<ii", skip, limit) + bson.BSON.encode(spec)
         if fields:
             message += bson.BSON.encode(fields)
 
+        query_opts = 0
+        if tailable:
+            query_opts |= _QUERY_OPTIONS["tailable_cursor"]
+        if tailable and await_data:
+            query_opts |= _QUERY_OPTIONS["await_data"]
+        query_opts = struct.pack("<i", query_opts)
+
         query = _MongoQuery(self.__id, collection, limit)
         self.__queries[self.__id] = query
-        self.send_message(2004, collection, message)
+        self.send_message(2004, collection, message, query_opts)
         return query.future
 
     def query_failure(self, request_id, cursor_id, response, raw_error):
@@ -205,4 +217,4 @@ class MongoProtocol(asyncio.Protocol):
             self.__queries[self.__id] = query
             self.OP_GET_MORE(query.collection, next_batch, cursor_id)
         else:
-            query.future.set_result(query.documents)
\ No newline at end of file
+            query.future.set_result(query.documents)