diff --git a/src/component-index.js b/src/component-index.js
index 4bf0b0f9847a575e31078bc2a74a27a565c953dd..04ecb8587e41315f29b0669e06dae2895397ea62 100644
--- a/src/component-index.js
+++ b/src/component-index.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,9 +20,6 @@ limitations under the License.
  * You can edit it you like, but your changes will be overwritten,
  * so you'd just be trying to swim upstream like a salmon.
  * You are not a salmon.
- *
- * To update it, run:
- *    ./reskindex.js -h header
  */
 
 module.exports.components = require('matrix-react-sdk/lib/component-index').components;
diff --git a/src/header b/src/header
index 060709b82eb6c55c4d529e7fb82436f94eb87c77..beee1ebe8917de57c3d929c0c668e84ea24e0220 100644
--- a/src/header
+++ b/src/header
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/webpack.config.js b/webpack.config.js
index efeab7fe8ba3997cdaf99b1a7137ec41fee3f5c9..8dd50ea6260615f23c8e65db5a020bcaa7c42240 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,6 +2,7 @@ const path = require('path');
 const webpack = require('webpack');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
+const ReskindexPlugin = require('matrix-react-sdk/lib/utils/ReskindexPlugin');
 
 module.exports = {
     entry: {
@@ -124,6 +125,8 @@ module.exports = {
             // about moving them.
             inject: false,
         }),
+
+        new ReskindexPlugin('./node_modules/matrix-react-sdk/header'),
     ],
     devtool: 'source-map',