diff --git a/package.json b/package.json
index 13942544c..6a0baca9b 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
         "react": "^15.6.0",
         "react-dom": "^15.6.0",
         "sanitize-html": "^1.19.1",
-        "ua-parser-js": "^0.7.19",
+        "ua-parser-js": "^0.7.33",
         "url": "^0.11.0"
     },
     "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index cf4098a84..be517ad76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6154,7 +6154,7 @@ math-random@^1.0.1:
   integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
 "matrix-js-sdk@file:matrix-js-sdk":
-  version "2.2.0-tchap-2.5.6"
+  version "2.2.0-tchap-2.5.8"
   dependencies:
     another-json "^0.2.0"
     babel-runtime "^6.26.0"
@@ -6168,8 +6168,18 @@ math-random@^1.0.1:
     unhomoglyph "^1.0.2"
 
 "matrix-js-sdk@link:matrix-js-sdk":
-  version "0.0.0"
-  uid ""
+  version "2.2.0-tchap-2.5.8"
+  dependencies:
+    another-json "^0.2.0"
+    babel-runtime "^6.26.0"
+    bluebird "^3.5.0"
+    browser-request "^0.3.3"
+    bs58 "^4.0.1"
+    content-type "^1.0.2"
+    loglevel "1.6.1"
+    qs "^6.5.2"
+    request "^2.88.0"
+    unhomoglyph "^1.0.2"
 
 matrix-mock-request@^1.2.3:
   version "1.2.3"
@@ -6180,8 +6190,57 @@ matrix-mock-request@^1.2.3:
     expect "^1.20.2"
 
 "matrix-react-sdk@link:matrix-react-sdk":
-  version "0.0.0"
-  uid ""
+  version "2.5.8-tchap"
+  dependencies:
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babel-runtime "^6.26.0"
+    bluebird "^3.5.0"
+    blueimp-canvas-to-blob "^3.5.0"
+    browser-encrypt-attachment "^0.3.0"
+    browser-request "^0.3.3"
+    classnames "^2.1.2"
+    commonmark "^0.28.1"
+    counterpart "^0.18.0"
+    emojibase-data "^4.0.0"
+    emojibase-regex "^3.0.0"
+    file-saver "^1.3.3"
+    filesize "3.5.6"
+    flux "2.1.1"
+    focus-trap-react "^3.0.5"
+    fuse.js "^2.2.0"
+    gemini-scrollbar "github:matrix-org/gemini-scrollbar#b302279"
+    gfm.css "^1.1.1"
+    glob "^5.0.14"
+    highlight.js "10.4.1"
+    is-ip "^2.0.0"
+    isomorphic-fetch "^2.2.1"
+    linkifyjs "^2.1.6"
+    lodash "^4.17.15"
+    lolex "2.3.2"
+    matrix-js-sdk "file:matrix-js-sdk"
+    optimist "^0.6.1"
+    pako "^1.0.5"
+    png-chunks-extract "^1.0.0"
+    prop-types "^15.5.8"
+    qrcode-react "^0.1.16"
+    qs "^6.6.0"
+    querystring "^0.2.0"
+    react "^15.6.0"
+    react-addons-css-transition-group "15.3.2"
+    react-beautiful-dnd "^4.0.1"
+    react-dom "^15.6.0"
+    react-gemini-scrollbar "github:matrix-org/react-gemini-scrollbar#5e97aef"
+    resize-observer-polyfill "^1.5.0"
+    sanitize-html "^2.3.2"
+    slate "^0.41.2"
+    slate-html-serializer "^0.6.1"
+    slate-md-serializer "github:matrix-org/slate-md-serializer#f7c4ad3"
+    slate-react "^0.18.10"
+    text-encoding-utf-8 "^1.0.1"
+    url "^0.11.0"
+    velocity-animate "^1.5.2"
+    whatwg-fetch "^1.1.1"
+    zxcvbn "^4.4.2"
 
 matrix-react-test-utils@^0.2.0:
   version "0.2.3"
@@ -9250,10 +9309,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-ua-parser-js@^0.7.18, ua-parser-js@^0.7.19, ua-parser-js@^0.7.30:
-  version "0.7.31"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
-  integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==
+ua-parser-js@^0.7.18, ua-parser-js@^0.7.30, ua-parser-js@^0.7.33:
+  version "0.7.33"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532"
+  integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"