diff --git a/packages/webpack/plugin.js b/packages/webpack/plugin.js
index 397e21021..e9f3c80ae 100644
--- a/packages/webpack/plugin.js
+++ b/packages/webpack/plugin.js
@@ -78,8 +78,8 @@ ModularCSS.prototype.apply = function(compiler) {
                         data.css
                     );
                 
-                // TODO: This is hacky beyond belief...
-                if(this.options.map && !this.options.map.inline) {
+                // Write out external source map if it exists
+                if(data.map) {
                     compilation.assets[`${this.options.css}.map`] = new sources.RawSource(
                         data.map.toString()
                     );
@@ -94,6 +94,7 @@ ModularCSS.prototype.apply = function(compiler) {
 
             return done();
         })
+        .catch(done)
     );
 };
 
diff --git a/packages/webpack/test/__snapshots__/webpack.test.js.snap b/packages/webpack/test/__snapshots__/webpack.test.js.snap
index 969342aba..cb8860b71 100644
--- a/packages/webpack/test/__snapshots__/webpack.test.js.snap
+++ b/packages/webpack/test/__snapshots__/webpack.test.js.snap
@@ -725,6 +725,13 @@ exports[`/webpack.js should output css to disk 2`] = `
 
 exports[`/webpack.js should output external source maps to disk 1`] = `"{\\"version\\":3,\\"sources\\":[\\"packages/webpack/test/specimens/simple.css\\"],\\"names\\":[],\\"mappings\\":\\"AAAA,gDAAC;AAAD,SAAS,WAAW,EAAE\\",\\"file\\":\\"simple.css\\",\\"sourcesContent\\":[\\".wooga { color: red; }\\\\n\\"]}"`;
 
+exports[`/webpack.js should output inline source maps 1`] = `
+"/* packages/webpack/test/specimens/simple.css */
+.wooga { color: red; }
+
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInBhY2thZ2VzL3dlYnBhY2svdGVzdC9zcGVjaW1lbnMvc2ltcGxlLmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxnREFBQztBQUFELFNBQVMsV0FBVyxFQUFFIiwiZmlsZSI6InNpbXBsZS5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIud29vZ2EgeyBjb2xvcjogcmVkOyB9XG4iXX0= */"
+`;
+
 exports[`/webpack.js should output json to disk 1`] = `
 "/******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
diff --git a/packages/webpack/test/webpack.test.js b/packages/webpack/test/webpack.test.js
index 36db5afe4..57dd8f446 100644
--- a/packages/webpack/test/webpack.test.js
+++ b/packages/webpack/test/webpack.test.js
@@ -1,3 +1,4 @@
+/* eslint-disable max-statements */
 "use strict";
 
 var fs   = require("fs"),
@@ -92,6 +93,38 @@ describe("/webpack.js", () => {
         });
     });
 
+    it("should output inline source maps", (done) => {
+        webpack({
+            entry  : "./packages/webpack/test/specimens/simple.js",
+            output : {
+                path     : output,
+                filename : "./simple.js"
+            },
+            module : {
+                rules : [
+                    {
+                        test,
+                        use
+                    }
+                ]
+            },
+            devtool : "source-map",
+            plugins : [
+                new Plugin({
+                    namer,
+                    css : "./simple.css",
+                    map : true
+                })
+            ]
+        }, (err, stats) => {
+            success(err, stats);
+
+            expect(read("simple.css")).toMatchSnapshot();
+
+            done();
+        });
+    });
+
     it("should output external source maps to disk", (done) => {
         webpack({
             entry  : "./packages/webpack/test/specimens/simple.js",