diff --git a/lib/client.js b/lib/client.js
index 4b5575a5d..a25348d1d 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -806,6 +806,25 @@ MatrixClient.prototype.addThreePid = function(creds, bind, callback) {
     );
 };
 
+/**
+ * @param {Object} authDict
+ * @param {string} newPassword
+ * @param {module:client.callback} callback Optional.
+ * @return {module:client.Promise} Resolves: TODO
+ * @return {module:http-api.MatrixError} Rejects: with an error response.
+ */
+MatrixClient.prototype.setPassword = function(authDict, newPassword, callback) {
+    var path = "/account/password";
+    var data = {
+        'auth': authDict,
+        'new_password': newPassword
+    };
+
+    return this._http.authedRequestWithPrefix(
+        callback, "POST", path, null, data, httpApi.PREFIX_V2_ALPHA
+    );
+};
+
 /**
  * @param {string} presence
  * @param {module:client.callback} callback Optional.