diff --git a/lib/client.js b/lib/client.js
index 50bec8400..503e3b05c 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -2098,14 +2098,19 @@ MatrixClient.prototype.searchMessageText = function(opts, callback) {
 /**
  * Perform a server-side search.
  * @param {Object} opts
+ * @param {string} opts.next_batch the batch token to pass in the query string
  * @param {Object} opts.body the JSON object to pass to the request body.
  * @param {module:client.callback} callback Optional.
  * @return {module:client.Promise} Resolves: TODO
  * @return {module:http-api.MatrixError} Rejects: with an error response.
  */
 MatrixClient.prototype.search = function(opts, callback) {
+    var queryparams = {};
+    if (opts.next_batch) {
+        queryparams.next_batch = opts.next_batch;
+    }
     return this._http.authedRequest(
-        callback, "POST", "/search", undefined, opts.body
+        callback, "POST", "/search", queryparams, opts.body
     );
 };