diff --git a/__tests__/fixtures/tailwind-input.css b/__tests__/fixtures/tailwind-input.css
index f48e73b26..6095e0b50 100644
--- a/__tests__/fixtures/tailwind-input.css
+++ b/__tests__/fixtures/tailwind-input.css
@@ -1,4 +1,4 @@
-@tailwind preflight;
+@tailwind base;
 
 @tailwind components;
 
diff --git a/package.json b/package.json
index 22aca9cf5..0271c3fcd 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "prebabelify": "rimraf lib",
-    "babelify": "babel src --out-dir lib",
+    "babelify": "babel src --out-dir lib --copy-files",
     "prepare": "npm run babelify && babel-node src/build.js",
     "style": "eslint .",
     "test": "jest && eslint ."
diff --git a/plugins/preflight.js b/plugins/preflight.js
new file mode 100644
index 000000000..9c427e26f
--- /dev/null
+++ b/plugins/preflight.js
@@ -0,0 +1 @@
+module.exports = require('../lib/plugins/preflight').default
diff --git a/preflight.css b/preflight.css
index f58c35efd..2f02db53f 100644
--- a/preflight.css
+++ b/preflight.css
@@ -1 +1 @@
-@tailwind preflight;
+@tailwind base;
diff --git a/src/corePlugins.js b/src/corePlugins.js
index a27a56998..ede2c9b04 100644
--- a/src/corePlugins.js
+++ b/src/corePlugins.js
@@ -1,3 +1,4 @@
+import preflight from './plugins/preflight'
 import lists from './plugins/lists'
 import appearance from './plugins/appearance'
 import backgroundAttachment from './plugins/backgroundAttachment'
@@ -68,6 +69,7 @@ function loadPlugins({ theme, variants, corePlugins }, plugins) {
 
 export default function(config) {
   return loadPlugins(config, {
+    preflight,
     lists,
     appearance,
     backgroundAttachment,
diff --git a/src/lib/substituteTailwindAtRules.js b/src/lib/substituteTailwindAtRules.js
index f75eed99c..581ec8001 100644
--- a/src/lib/substituteTailwindAtRules.js
+++ b/src/lib/substituteTailwindAtRules.js
@@ -1,4 +1,3 @@
-import fs from 'fs'
 import _ from 'lodash'
 import postcss from 'postcss'
 
@@ -14,15 +13,6 @@ export default function(
 ) {
   return function(css) {
     css.walkAtRules('tailwind', atRule => {
-      if (atRule.params === 'preflight') {
-        const preflightTree = postcss.parse(
-          fs.readFileSync(`${__dirname}/../../css/preflight.css`, 'utf8')
-        )
-
-        atRule.before(updateSource(preflightTree, atRule.source))
-        atRule.remove()
-      }
-
       if (atRule.params === 'base') {
         atRule.before(updateSource(pluginBase, atRule.source))
         atRule.remove()
diff --git a/css/preflight.css b/src/plugins/css/preflight.css
similarity index 100%
rename from css/preflight.css
rename to src/plugins/css/preflight.css
diff --git a/src/plugins/preflight.js b/src/plugins/preflight.js
new file mode 100644
index 000000000..56ccdd3b9
--- /dev/null
+++ b/src/plugins/preflight.js
@@ -0,0 +1,9 @@
+import fs from 'fs'
+import postcss from 'postcss'
+
+export default function() {
+  return function({ addBase }) {
+    const preflightStyles = postcss.parse(fs.readFileSync(`${__dirname}/css/preflight.css`, 'utf8'))
+    addBase(preflightStyles.nodes)
+  }
+}
diff --git a/tailwind.css b/tailwind.css
index 5881ba48f..7f393742a 100644
--- a/tailwind.css
+++ b/tailwind.css
@@ -1,4 +1,4 @@
-@tailwind preflight;
+@tailwind base;
 
 @tailwind components;