diff --git a/package.json b/package.json
index fb71febdd3..98abccb89b 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "favico.js": "^0.3.10",
     "matrix-js-sdk": "0.10.1",
-    "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop",
+    "matrix-react-sdk": "0.12.2",
     "modernizr": "^3.1.0",
     "prop-types": "^15.5.10",
     "react": "^15.6.0",
@@ -89,7 +89,6 @@
     "chokidar": "^1.6.1",
     "cpx": "^1.3.2",
     "cross-env": "^4.0.0",
-    "css-raw-loader": "^0.1.1",
     "electron-builder": "^11.2.4",
     "electron-builder-squirrel-windows": "^11.2.1",
     "electron-devtools-installer": "^2.2.0",
@@ -127,6 +126,7 @@
     "postcss-scss": "^1.0.5",
     "postcss-simple-vars": "^4.1.0",
     "postcss-strip-inline-comments": "^0.1.5",
+    "raw-loader": "^0.5.1",
     "react-addons-perf": "^15.4.0",
     "react-addons-test-utils": "^15.6.0",
     "rimraf": "^2.4.3",
diff --git a/webpack.config.js b/webpack.config.js
index c8482a84de..38825bff5b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -45,7 +45,7 @@ module.exports = {
                 // 3. ExtractTextPlugin turns that string into a separate asset.
                 use: ExtractTextPlugin.extract({
                     use: [
-                        "css-raw-loader",
+                        "raw-loader",
                         "postcss-loader"
                     ],
                 }),
@@ -60,7 +60,7 @@ module.exports = {
                     path.resolve(__dirname, "node_modules/matrix-react-sdk/node_modules/gemini-scrollbar/"),
                 ],
                 use: ExtractTextPlugin.extract({
-                    use: "css-raw-loader"
+                    use: "raw-loader"
                 }),
             },