diff --git a/package.json b/package.json
index b1ae2c444..cb2011df4 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,6 @@
     "redux-thunk": "2.2.0",
     "stylelint-config-wikimedia": "0.3.0",
     "tap-dot": "^1.0.5",
-    "webpack": "^1.14.0"
+    "webpack": "^2.2.1"
   }
 }
diff --git a/resources/dist/index.js b/resources/dist/index.js
index 55735dbcc..bc5a77023 100644
Binary files a/resources/dist/index.js and b/resources/dist/index.js differ
diff --git a/resources/dist/index.js.map b/resources/dist/index.js.map
index 159e13178..d22affbe0 100644
Binary files a/resources/dist/index.js.map and b/resources/dist/index.js.map differ
diff --git a/webpack.config.js b/webpack.config.js
index 6f1e385d0..1c340b9f4 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -21,5 +21,11 @@ module.exports = {
 			redux: path.resolve(__dirname, 'node_modules/redux/dist/redux.js'),
 			'redux-thunk': path.resolve(__dirname, 'node_modules/redux-thunk/dist/redux-thunk.js')
 		}
-	}
+	},
+	plugins: [
+		// To generate identifiers that are preserved over builds, webpack supplies
+		// the NamedModulesPlugin (generates comments with file names on bundle)
+		// https://webpack.js.org/guides/caching/#deterministic-hashes
+		new webpack.NamedModulesPlugin()
+	]
 };