diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22049b6af6..8bc4bbcfce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+Changes in [0.9.7](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.7) (2017-06-22)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.6...v0.9.7)
+
+ * Fix ability to invite users with caps in their user IDs
+   [\#1128](https://github.com/matrix-org/matrix-react-sdk/pull/1128)
+ * Fix another race with first-sync
+   [\#1131](https://github.com/matrix-org/matrix-react-sdk/pull/1131)
+ * Make the indexeddb worker script work again
+   [\#1132](https://github.com/matrix-org/matrix-react-sdk/pull/1132)
+ * Use the web worker when clearing js-sdk stores
+   [\#1133](https://github.com/matrix-org/matrix-react-sdk/pull/1133)
+
 Changes in [0.9.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.6) (2017-06-20)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.5...v0.9.6)
diff --git a/package.json b/package.json
index f49fc04661..cbc06c9771 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -64,7 +64,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "matrix-js-sdk": "0.7.12",
+    "matrix-js-sdk": "0.7.13",
     "optimist": "^0.6.1",
     "prop-types": "^15.5.8",
     "q": "^1.4.1",
diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 307e65e861..0676e4600f 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -48,7 +48,6 @@ class MatrixClientPeg {
         this.opts = {
             initialSyncLimit: 20,
         };
-        this.indexedDbWorkerScript = null;
     }
 
     /**
@@ -59,7 +58,7 @@ class MatrixClientPeg {
      * @param {string} script href to the script to be passed to the web worker
      */
     setIndexedDbWorkerScript(script) {
-        this.indexedDbWorkerScript = script;
+        createMatrixClient.indexedDbWorkerScript = script;
     }
 
     get(): MatrixClient {
diff --git a/src/utils/createMatrixClient.js b/src/utils/createMatrixClient.js
index 5effd63f2a..b95a9f111f 100644
--- a/src/utils/createMatrixClient.js
+++ b/src/utils/createMatrixClient.js
@@ -25,13 +25,13 @@ const localStorage = window.localStorage;
  * @param {Object} opts  options to pass to Matrix.createClient. This will be
  *    extended with `sessionStore` and `store` members.
  *
- * @param {string} indexedDbWorkerScript  Optional URL for a web worker script
- *    for IndexedDB store operations. If not given, indexeddb ops are done on
+ * @property {string} indexedDbWorkerScript  Optional URL for a web worker script
+ *    for IndexedDB store operations. By default, indexeddb ops are done on
  *    the main thread.
  *
  * @returns {MatrixClient} the newly-created MatrixClient
  */
-export default function createMatrixClient(opts, indexedDbWorkerScript) {
+export default function createMatrixClient(opts) {
     const storeOpts = {};
 
     if (localStorage) {
@@ -45,7 +45,7 @@ export default function createMatrixClient(opts, indexedDbWorkerScript) {
             indexedDB: window.indexedDB,
             dbName: "riot-web-sync",
             localStorage: localStorage,
-            workerScript: indexedDbWorkerScript,
+            workerScript: createMatrixClient.indexedDbWorkerScript,
         });
     }
 
@@ -53,3 +53,5 @@ export default function createMatrixClient(opts, indexedDbWorkerScript) {
 
     return Matrix.createClient(opts);
 }
+
+createMatrixClient.indexedDbWorkerScript = null;