diff --git a/package-lock.json b/package-lock.json
index 9581f2a3..4c1f1f27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,7 +2,6 @@
   "name": "extract-text-webpack-plugin",
   "version": "3.0.2",
   "lockfileVersion": 1,
-  "requires": true,
   "dependencies": {
     "JSONStream": {
       "version": "1.3.2",
diff --git a/package.json b/package.json
index 4b1e3d29..253364f1 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "scripts": {
     "start": "npm run build -- -w",
     "appveyor:test": "npm run test",
-    "build": "cross-env NODE_ENV=production babel src -d dist --ignore 'src/**/*.test.js'",
+    "build": "cross-env NODE_ENV=production babel src -d dist --ignore 'src/**/*.test.js' --copy-files",
     "build:example": "(cd example && webpack)",
     "clean": "del-cli dist",
     "lint": "eslint --cache src test",
diff --git a/src/index.js b/src/index.js
index 15c7e3e8..687dc9e3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -15,6 +15,7 @@ import {
   mergeOptions,
   isString,
   isFunction,
+  cloneModule,
 } from './lib/helpers';
 
 const NS = path.dirname(fs.realpathSync(__filename));
@@ -26,7 +27,7 @@ class ExtractTextPlugin {
     if (isString(options)) {
       options = { filename: options };
     } else {
-      validateOptions(path.resolve(__dirname, '../schema/plugin.json'), options, 'Extract Text Plugin');
+      validateOptions(path.resolve(__dirname, './plugin.json'), options, 'Extract Text Plugin');
     }
     this.filename = options.filename;
     this.id = options.id != null ? options.id : ++nextId;
@@ -88,7 +89,7 @@ class ExtractTextPlugin {
     if (Array.isArray(options) || isString(options) || typeof options.options === 'object' || typeof options.query === 'object') {
       options = { use: options };
     } else {
-      validateOptions(path.resolve(__dirname, '../schema/loader.json'), options, 'Extract Text Plugin (Loader)');
+      validateOptions(path.resolve(__dirname, './loader.json'), options, 'Extract Text Plugin (Loader)');
     }
     let loader = options.use;
     let before = options.fallback || [];
@@ -115,7 +116,9 @@ class ExtractTextPlugin {
       compilation.plugin('normal-module-loader', (loaderContext, module) => {
         loaderContext[NS] = (content, opt) => {
           if (options.disable) { return false; }
-          if (!Array.isArray(content) && content != null) { throw new Error(`Exported value was not extracted as an array: ${JSON.stringify(content)}`); }
+          if (!Array.isArray(content) && content != null) {
+            throw new Error(`Exported value was not extracted as an array: ${JSON.stringify(content)}`);
+          }
           module[NS] = {
             content,
             options: opt || {},
@@ -126,8 +129,12 @@ class ExtractTextPlugin {
       const filename = this.filename;
       const id = this.id;
       let extractedChunks;
+      let toRemoveModules;
+
       compilation.plugin('optimize-tree', (chunks, modules, callback) => {
         extractedChunks = chunks.map(() => new Chunk());
+        toRemoveModules = [];
+
         chunks.forEach((chunk, i) => {
           const extractedChunk = extractedChunks[i];
           extractedChunk.index = i;
@@ -161,24 +168,40 @@ class ExtractTextPlugin {
                 }
               }
               if (shouldExtract || (!module.extracted && !wasExtracted)) {
-                module[`${NS}/extract`] = true; // eslint-disable-line no-path-concat
-                compilation.rebuildModule(module, (err) => {
+                const newModule = cloneModule(module);
+                newModule[`${NS}/extract`] = shouldExtract; // eslint-disable-line no-path-concat
+                compilation.buildModule(newModule, false, newModule, null, (err) => {
                   if (err) {
                     compilation.errors.push(err);
                     return callback();
                   }
-                  meta = module[NS];
+                  meta = newModule[NS];
+
+                  const identifier = module.identifier();
                   // Error out if content is not an array and is not null
                   if (!Array.isArray(meta.content) && meta.content != null) {
-                    err = new Error(`${module.identifier()} doesn't export content`);
+                    err = new Error(`${identifier} doesn't export content`);
                     compilation.errors.push(err);
                     return callback();
                   }
-                  if (meta.content) { extractCompilation.addResultToChunk(module.identifier(), meta.content, module, extractedChunk); }
+                  if (meta.content) {
+                    extractCompilation.addResultToChunk(identifier, meta.content, module, extractedChunk);
+                    if (toRemoveModules[identifier]) {
+                      toRemoveModules[identifier].chunks.push(chunk);
+                    } else {
+                      toRemoveModules[identifier] = {
+                        module: newModule,
+                        moduleToRemove: module,
+                        chunks: [chunk],
+                      };
+                    }
+                  }
                   callback();
                 });
               } else {
-                if (meta.content) { extractCompilation.addResultToChunk(module.identifier(), meta.content, module, extractedChunk); }
+                if (meta.content) {
+                  extractCompilation.addResultToChunk(module.identifier(), meta.content, module, extractedChunk);
+                }
                 callback();
               }
             } else callback();
@@ -202,6 +225,30 @@ class ExtractTextPlugin {
           callback();
         });
       });
+
+      compilation.plugin('optimize-module-ids', (modules) => {
+        modules.forEach((module) => {
+          const data = toRemoveModules[module.identifier()];
+
+          if (data) {
+            const oldModuleId = module.id;
+            const newModule = cloneModule(module);
+            newModule.id = oldModuleId;
+            newModule._source = data.module._source; // eslint-disable-line no-underscore-dangle
+            data.chunks.forEach((chunk) => {
+              chunk.removeModule(data.moduleToRemove);
+              const deps = data.moduleToRemove.dependencies;
+              deps.forEach((d) => {
+                if (d.module && d.module.loaders.length > 0) {
+                  chunk.removeModule(d.module);
+                }
+              });
+              chunk.addModule(newModule);
+            });
+          }
+        });
+      });
+
       compilation.plugin('additional-assets', (callback) => {
         extractedChunks.forEach((extractedChunk) => {
           if (extractedChunk.getNumberOfModules()) {
diff --git a/src/lib/helpers.js b/src/lib/helpers.js
index 2fbe3d61..54f76ea1 100644
--- a/src/lib/helpers.js
+++ b/src/lib/helpers.js
@@ -1,3 +1,5 @@
+import NormalModule from 'webpack/lib/NormalModule';
+
 export function isInitialOrHasNoParents(chunk) {
   return chunk.isInitial() || chunk.parents.length === 0;
 }
@@ -28,6 +30,17 @@ export function getOrder(a, b) {
   return 0;
 }
 
+export function cloneModule(module) {
+  return new NormalModule(
+    module.request,
+    module.userRequest,
+    module.rawRequest,
+    module.loaders,
+    module.resource,
+    module.parser,
+  );
+}
+
 export function getLoaderObject(loader) {
   if (isString(loader)) {
     return { loader };
diff --git a/schema/loader.json b/src/loader.json
similarity index 100%
rename from schema/loader.json
rename to src/loader.json
diff --git a/schema/plugin.json b/src/plugin.json
similarity index 100%
rename from schema/plugin.json
rename to src/plugin.json
diff --git a/test/__snapshots__/webpack-integration.test.js.snap b/test/__snapshots__/webpack-integration.test.js.snap
index b18a0245..e3446c0c 100644
--- a/test/__snapshots__/webpack-integration.test.js.snap
+++ b/test/__snapshots__/webpack-integration.test.js.snap
@@ -90,6 +90,232 @@ c
 "
 `;
 
+exports[`Webpack Integration Tests multiple-entries-all-async 1`] = `
+"webpackJsonp([0],{
+
+/***/ 1:
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(7);
+
+modules.export = function() {
+	return 'Route Homepage';
+};
+
+
+/***/ }),
+
+/***/ 7:
+/***/ (function(module, exports) {
+
+// removed by extract-text-webpack-plugin
+
+/***/ })
+
+});"
+`;
+
+exports[`Webpack Integration Tests multiple-entries-all-async 2`] = `
+"webpackJsonp([1],{
+
+/***/ 0:
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(6);
+
+modules.export = function() {
+	return 'Route Contact';
+};
+
+
+/***/ }),
+
+/***/ 6:
+/***/ (function(module, exports) {
+
+// removed by extract-text-webpack-plugin
+
+/***/ })
+
+});"
+`;
+
+exports[`Webpack Integration Tests multiple-entries-all-async 3`] = `
+"body {
+	background: red;
+}
+.contact {
+	color: black;
+}
+.homepage {
+	color: black;
+}
+"
+`;
+
+exports[`Webpack Integration Tests multiple-entries-all-async 4`] = `
+"body {
+	background: red;
+}
+.contact {
+	color: black;
+}
+.homepage {
+	color: black;
+}
+"
+`;
+
+exports[`Webpack Integration Tests multiple-entries-async 1`] = `
+"webpackJsonp([0],{
+
+/***/ 12:
+/***/ (function(module, exports, __webpack_require__) {
+
+// style-loader: Adds some css to the DOM by adding a <style> tag
+
+// load the styles
+var content = __webpack_require__(13);
+if(typeof content === 'string') content = [[module.i, content, '']];
+// Prepare cssTransformation
+var transform;
+
+var options = {\\"hmr\\":true}
+options.transform = transform
+// add the styles to the DOM
+var update = __webpack_require__(1)(content, options);
+if(content.locals) module.exports = content.locals;
+// Hot Module Replacement
+if(false) {
+	// When the styles change, update the <style> tags
+	if(!content.locals) {
+		module.hot.accept(\\"!!../../../../../node_modules/css-loader/index.js??ref--0-2!./styles.css\\", function() {
+			var newContent = require(\\"!!../../../../../node_modules/css-loader/index.js??ref--0-2!./styles.css\\");
+			if(typeof newContent === 'string') newContent = [[module.id, newContent, '']];
+			update(newContent);
+		});
+	}
+	// When the module is disposed, remove the <style> tags
+	module.hot.dispose(function() { update(); });
+}
+
+/***/ }),
+
+/***/ 13:
+/***/ (function(module, exports, __webpack_require__) {
+
+exports = module.exports = __webpack_require__(0)(false);
+// imports
+
+
+// module
+exports.push([module.i, \\".homepage {\\\\n\\\\tcolor: yellow;\\\\n}\\\\n\\", \\"\\"]);
+
+// exports
+
+
+/***/ }),
+
+/***/ 3:
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(12);
+
+modules.export = function() {
+	return 'Route Homepage';
+};
+
+
+/***/ })
+
+});"
+`;
+
+exports[`Webpack Integration Tests multiple-entries-async 2`] = `
+"webpackJsonp([1],{
+
+/***/ 10:
+/***/ (function(module, exports, __webpack_require__) {
+
+// style-loader: Adds some css to the DOM by adding a <style> tag
+
+// load the styles
+var content = __webpack_require__(11);
+if(typeof content === 'string') content = [[module.i, content, '']];
+// Prepare cssTransformation
+var transform;
+
+var options = {\\"hmr\\":true}
+options.transform = transform
+// add the styles to the DOM
+var update = __webpack_require__(1)(content, options);
+if(content.locals) module.exports = content.locals;
+// Hot Module Replacement
+if(false) {
+	// When the styles change, update the <style> tags
+	if(!content.locals) {
+		module.hot.accept(\\"!!../../../../../node_modules/css-loader/index.js??ref--0-2!./styles.css\\", function() {
+			var newContent = require(\\"!!../../../../../node_modules/css-loader/index.js??ref--0-2!./styles.css\\");
+			if(typeof newContent === 'string') newContent = [[module.id, newContent, '']];
+			update(newContent);
+		});
+	}
+	// When the module is disposed, remove the <style> tags
+	module.hot.dispose(function() { update(); });
+}
+
+/***/ }),
+
+/***/ 11:
+/***/ (function(module, exports, __webpack_require__) {
+
+exports = module.exports = __webpack_require__(0)(false);
+// imports
+
+
+// module
+exports.push([module.i, \\".contact {\\\\n\\\\tcolor: black;\\\\n}\\\\n\\", \\"\\"]);
+
+// exports
+
+
+/***/ }),
+
+/***/ 2:
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(10);
+
+modules.export = function() {
+	return 'Route Contact';
+};
+
+
+/***/ })
+
+});"
+`;
+
+exports[`Webpack Integration Tests multiple-entries-async 3`] = `
+"body {
+	background: red;
+}
+.contact {
+	color: black;
+}
+"
+`;
+
+exports[`Webpack Integration Tests multiple-entries-async 4`] = `
+"body {
+	background: red;
+}
+.homepage {
+	color: yellow;
+}
+"
+`;
+
 exports[`Webpack Integration Tests multiple-entries-filename 1`] = `
 "a
 b
diff --git a/test/cases/multiple-entries-all-async/default-styles.css b/test/cases/multiple-entries-all-async/default-styles.css
new file mode 100644
index 00000000..f0d5b13b
--- /dev/null
+++ b/test/cases/multiple-entries-all-async/default-styles.css
@@ -0,0 +1,3 @@
+body {
+	background: red;
+}
diff --git a/test/cases/multiple-entries-all-async/entries/contact.js b/test/cases/multiple-entries-all-async/entries/contact.js
new file mode 100644
index 00000000..66b458c2
--- /dev/null
+++ b/test/cases/multiple-entries-all-async/entries/contact.js
@@ -0,0 +1,2 @@
+require('../router');
+require('../routes/contact');
diff --git a/test/cases/multiple-entries-all-async/entries/homepage.js b/test/cases/multiple-entries-all-async/entries/homepage.js
new file mode 100644
index 00000000..7a8e5aea
--- /dev/null
+++ b/test/cases/multiple-entries-all-async/entries/homepage.js
@@ -0,0 +1,2 @@
+require('../router');
+require('../routes/homepage');
diff --git a/test/cases/multiple-entries-all-async/expected/0.js b/test/cases/multiple-entries-all-async/expected/0.js
new file mode 100644
index 00000000..b963b298
--- /dev/null
+++ b/test/cases/multiple-entries-all-async/expected/0.js
@@ -0,0 +1,22 @@
+webpackJsonp([0],{
+
+/***/ 1:
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(7);
+
+modules.export = function() {
+	return 'Route Homepage';
+};
+
+
+/***/ }),
+
+/***/ 7:
+/***/ (function(module, exports) {
+
+// removed by extract-text-webpack-plugin
+
+/***/ })
+
+});
\ No newline at end of file
diff --git a/test/cases/multiple-entries-all-async/expected/1.js b/test/cases/multiple-entries-all-async/expected/1.js
new file mode 100644
index 00000000..5b634031
--- /dev/null
+++ b/test/cases/multiple-entries-all-async/expected/1.js
@@ -0,0 +1,22 @@
+webpackJsonp([1],{
+
+/***/ 0:
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(6);
+
+modules.export = function() {
+	return 'Route Contact';
+};
+
+
+/***/ }),
+
+/***/ 6:
+/***/ (function(module, exports) {
+
+// removed by extract-text-webpack-plugin
+
+/***/ })
+
+});
\ No newline at end of file
diff --git a/test/cases/multiple-entries-all-async/expected/contact.css b/test/cases/multiple-entries-all-async/expected/contact.css
new file mode 100644
index 00000000..c952ccfd
--- /dev/null
+++ b/test/cases/multiple-entries-all-async/expected/contact.css
@@ -0,0 +1,9 @@
+body {
+	background: red;
+}
+.contact {
+	color: black;
+}
+.homepage {
+	color: black;
+}
diff --git a/test/cases/multiple-entries-all-async/expected/homepage.css b/test/cases/multiple-entries-all-async/expected/homepage.css
new file mode 100644
index 00000000..c952ccfd
--- /dev/null
+++ b/test/cases/multiple-entries-all-async/expected/homepage.css
@@ -0,0 +1,9 @@
+body {
+	background: red;
+}
+.contact {
+	color: black;
+}
+.homepage {
+	color: black;
+}
diff --git a/test/cases/multiple-entries-all-async/router.js b/test/cases/multiple-entries-all-async/router.js
new file mode 100644
index 00000000..d9855317
--- /dev/null
+++ b/test/cases/multiple-entries-all-async/router.js
@@ -0,0 +1,6 @@
+require('./default-styles.css');
+module.export = function (route) {
+	return import(/* webpackChunkName: "route-[request]" */ './routes/' + route + 'index.js').then(function (route) {
+		return route;
+	});
+};
diff --git a/test/cases/multiple-entries-all-async/routes/contact/index.js b/test/cases/multiple-entries-all-async/routes/contact/index.js
new file mode 100644
index 00000000..c16daacb
--- /dev/null
+++ b/test/cases/multiple-entries-all-async/routes/contact/index.js
@@ -0,0 +1,5 @@
+require('./styles.css');
+
+modules.export = function() {
+	return 'Route Contact';
+};
diff --git a/test/cases/multiple-entries-all-async/routes/contact/styles.css b/test/cases/multiple-entries-all-async/routes/contact/styles.css
new file mode 100644
index 00000000..fd8a667d
--- /dev/null
+++ b/test/cases/multiple-entries-all-async/routes/contact/styles.css
@@ -0,0 +1,3 @@
+.contact {
+	color: black;
+}
diff --git a/test/cases/multiple-entries-all-async/routes/homepage/index.js b/test/cases/multiple-entries-all-async/routes/homepage/index.js
new file mode 100644
index 00000000..bb86d26e
--- /dev/null
+++ b/test/cases/multiple-entries-all-async/routes/homepage/index.js
@@ -0,0 +1,5 @@
+require('./styles.css');
+
+modules.export = function() {
+	return 'Route Homepage';
+};
diff --git a/test/cases/multiple-entries-all-async/routes/homepage/styles.css b/test/cases/multiple-entries-all-async/routes/homepage/styles.css
new file mode 100644
index 00000000..1fc1fc5a
--- /dev/null
+++ b/test/cases/multiple-entries-all-async/routes/homepage/styles.css
@@ -0,0 +1,3 @@
+.homepage {
+	color: black;
+}
diff --git a/test/cases/multiple-entries-all-async/webpack.config.js b/test/cases/multiple-entries-all-async/webpack.config.js
new file mode 100644
index 00000000..1027d609
--- /dev/null
+++ b/test/cases/multiple-entries-all-async/webpack.config.js
@@ -0,0 +1,24 @@
+import ExtractTextPlugin from '../../../src/index';
+
+module.exports = {
+	entry: {
+		'homepage': "./entries/homepage.js",
+		'contact': "./entries/contact.js"
+	},
+	module: {
+		loaders: [
+			{ test: /\.css$/, use: ExtractTextPlugin.extract({
+				fallback: "style-loader",
+				use: { loader: "css-loader", options: {
+					sourceMap: false
+				} }
+			}) }
+		]
+	},
+	plugins: [
+		new ExtractTextPlugin({
+			filename: '[name].css',
+			allChunks: true
+		})
+	]
+};
diff --git a/test/cases/multiple-entries-async/default-styles.css b/test/cases/multiple-entries-async/default-styles.css
new file mode 100644
index 00000000..f0d5b13b
--- /dev/null
+++ b/test/cases/multiple-entries-async/default-styles.css
@@ -0,0 +1,3 @@
+body {
+	background: red;
+}
diff --git a/test/cases/multiple-entries-async/entries/contact.js b/test/cases/multiple-entries-async/entries/contact.js
new file mode 100644
index 00000000..66b458c2
--- /dev/null
+++ b/test/cases/multiple-entries-async/entries/contact.js
@@ -0,0 +1,2 @@
+require('../router');
+require('../routes/contact');
diff --git a/test/cases/multiple-entries-async/entries/homepage.js b/test/cases/multiple-entries-async/entries/homepage.js
new file mode 100644
index 00000000..7a8e5aea
--- /dev/null
+++ b/test/cases/multiple-entries-async/entries/homepage.js
@@ -0,0 +1,2 @@
+require('../router');
+require('../routes/homepage');
diff --git a/test/cases/multiple-entries-async/expected/0.js b/test/cases/multiple-entries-async/expected/0.js
new file mode 100644
index 00000000..bdafcf13
--- /dev/null
+++ b/test/cases/multiple-entries-async/expected/0.js
@@ -0,0 +1,62 @@
+webpackJsonp([0],{
+
+/***/ 12:
+/***/ (function(module, exports, __webpack_require__) {
+
+// style-loader: Adds some css to the DOM by adding a <style> tag
+
+// load the styles
+var content = __webpack_require__(13);
+if(typeof content === 'string') content = [[module.i, content, '']];
+// Prepare cssTransformation
+var transform;
+
+var options = {"hmr":true}
+options.transform = transform
+// add the styles to the DOM
+var update = __webpack_require__(1)(content, options);
+if(content.locals) module.exports = content.locals;
+// Hot Module Replacement
+if(false) {
+	// When the styles change, update the <style> tags
+	if(!content.locals) {
+		module.hot.accept("!!../../../../../node_modules/css-loader/index.js??ref--0-2!./styles.css", function() {
+			var newContent = require("!!../../../../../node_modules/css-loader/index.js??ref--0-2!./styles.css");
+			if(typeof newContent === 'string') newContent = [[module.id, newContent, '']];
+			update(newContent);
+		});
+	}
+	// When the module is disposed, remove the <style> tags
+	module.hot.dispose(function() { update(); });
+}
+
+/***/ }),
+
+/***/ 13:
+/***/ (function(module, exports, __webpack_require__) {
+
+exports = module.exports = __webpack_require__(0)(false);
+// imports
+
+
+// module
+exports.push([module.i, ".homepage {\n\tcolor: yellow;\n}\n", ""]);
+
+// exports
+
+
+/***/ }),
+
+/***/ 3:
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(12);
+
+modules.export = function() {
+	return 'Route Homepage';
+};
+
+
+/***/ })
+
+});
\ No newline at end of file
diff --git a/test/cases/multiple-entries-async/expected/1.js b/test/cases/multiple-entries-async/expected/1.js
new file mode 100644
index 00000000..5a0d9965
--- /dev/null
+++ b/test/cases/multiple-entries-async/expected/1.js
@@ -0,0 +1,62 @@
+webpackJsonp([1],{
+
+/***/ 10:
+/***/ (function(module, exports, __webpack_require__) {
+
+// style-loader: Adds some css to the DOM by adding a <style> tag
+
+// load the styles
+var content = __webpack_require__(11);
+if(typeof content === 'string') content = [[module.i, content, '']];
+// Prepare cssTransformation
+var transform;
+
+var options = {"hmr":true}
+options.transform = transform
+// add the styles to the DOM
+var update = __webpack_require__(1)(content, options);
+if(content.locals) module.exports = content.locals;
+// Hot Module Replacement
+if(false) {
+	// When the styles change, update the <style> tags
+	if(!content.locals) {
+		module.hot.accept("!!../../../../../node_modules/css-loader/index.js??ref--0-2!./styles.css", function() {
+			var newContent = require("!!../../../../../node_modules/css-loader/index.js??ref--0-2!./styles.css");
+			if(typeof newContent === 'string') newContent = [[module.id, newContent, '']];
+			update(newContent);
+		});
+	}
+	// When the module is disposed, remove the <style> tags
+	module.hot.dispose(function() { update(); });
+}
+
+/***/ }),
+
+/***/ 11:
+/***/ (function(module, exports, __webpack_require__) {
+
+exports = module.exports = __webpack_require__(0)(false);
+// imports
+
+
+// module
+exports.push([module.i, ".contact {\n\tcolor: black;\n}\n", ""]);
+
+// exports
+
+
+/***/ }),
+
+/***/ 2:
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(10);
+
+modules.export = function() {
+	return 'Route Contact';
+};
+
+
+/***/ })
+
+});
\ No newline at end of file
diff --git a/test/cases/multiple-entries-async/expected/contact.css b/test/cases/multiple-entries-async/expected/contact.css
new file mode 100644
index 00000000..9b2cf499
--- /dev/null
+++ b/test/cases/multiple-entries-async/expected/contact.css
@@ -0,0 +1,6 @@
+body {
+	background: red;
+}
+.contact {
+	color: black;
+}
diff --git a/test/cases/multiple-entries-async/expected/homepage.css b/test/cases/multiple-entries-async/expected/homepage.css
new file mode 100644
index 00000000..44691a9d
--- /dev/null
+++ b/test/cases/multiple-entries-async/expected/homepage.css
@@ -0,0 +1,6 @@
+body {
+	background: red;
+}
+.homepage {
+	color: yellow;
+}
diff --git a/test/cases/multiple-entries-async/router.js b/test/cases/multiple-entries-async/router.js
new file mode 100644
index 00000000..d9855317
--- /dev/null
+++ b/test/cases/multiple-entries-async/router.js
@@ -0,0 +1,6 @@
+require('./default-styles.css');
+module.export = function (route) {
+	return import(/* webpackChunkName: "route-[request]" */ './routes/' + route + 'index.js').then(function (route) {
+		return route;
+	});
+};
diff --git a/test/cases/multiple-entries-async/routes/contact/index.js b/test/cases/multiple-entries-async/routes/contact/index.js
new file mode 100644
index 00000000..c16daacb
--- /dev/null
+++ b/test/cases/multiple-entries-async/routes/contact/index.js
@@ -0,0 +1,5 @@
+require('./styles.css');
+
+modules.export = function() {
+	return 'Route Contact';
+};
diff --git a/test/cases/multiple-entries-async/routes/contact/styles.css b/test/cases/multiple-entries-async/routes/contact/styles.css
new file mode 100644
index 00000000..fd8a667d
--- /dev/null
+++ b/test/cases/multiple-entries-async/routes/contact/styles.css
@@ -0,0 +1,3 @@
+.contact {
+	color: black;
+}
diff --git a/test/cases/multiple-entries-async/routes/homepage/index.js b/test/cases/multiple-entries-async/routes/homepage/index.js
new file mode 100644
index 00000000..bb86d26e
--- /dev/null
+++ b/test/cases/multiple-entries-async/routes/homepage/index.js
@@ -0,0 +1,5 @@
+require('./styles.css');
+
+modules.export = function() {
+	return 'Route Homepage';
+};
diff --git a/test/cases/multiple-entries-async/routes/homepage/styles.css b/test/cases/multiple-entries-async/routes/homepage/styles.css
new file mode 100644
index 00000000..7245e74c
--- /dev/null
+++ b/test/cases/multiple-entries-async/routes/homepage/styles.css
@@ -0,0 +1,3 @@
+.homepage {
+	color: yellow;
+}
diff --git a/test/cases/multiple-entries-async/webpack.config.js b/test/cases/multiple-entries-async/webpack.config.js
new file mode 100644
index 00000000..7865eab1
--- /dev/null
+++ b/test/cases/multiple-entries-async/webpack.config.js
@@ -0,0 +1,24 @@
+import ExtractTextPlugin from '../../../src/index';
+
+module.exports = {
+	entry: {
+		'homepage': "./entries/homepage.js",
+		'contact': "./entries/contact.js"
+	},
+	module: {
+		loaders: [
+			{ test: /\.css$/, use: ExtractTextPlugin.extract({
+				fallback: "style-loader",
+				use: { loader: "css-loader", options: {
+					sourceMap: false
+				} }
+			}) }
+		]
+	},
+	plugins: [
+		new ExtractTextPlugin({
+			filename: '[name].css',
+			allChunks: false
+		})
+	]
+};