diff --git a/src/lib/webpack-config.js b/src/lib/webpack-config.js
index 4d610ef55..79096d00b 100644
--- a/src/lib/webpack-config.js
+++ b/src/lib/webpack-config.js
@@ -64,7 +64,7 @@ export default env => {
 			path: resolve(cwd, env.dest || 'build'),
 			publicPath: '/',
 			filename: 'bundle.js',
-			chunkFilename: '[name].chunk.[chunkhash].js'
+			chunkFilename: '[name].chunk.[chunkhash:5].js'
 		}),
 
 		customConfig({
@@ -374,6 +374,7 @@ const development = config => {
 };
 
 const production = config => addPlugins([
+	new webpack.HashedModuleIdsPlugin(),
 	new webpack.LoaderOptionsPlugin({
 		minimize: true
 	}),