diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..73af2c19b
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+- "7.0"
\ No newline at end of file
diff --git a/package.json b/package.json
index 999782dce..df049a2d8 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,6 @@
     "eslint-plugin-react": "^7.0.1"
   },
   "dependencies": {
-    "@webpack-blocks/babel6": "^0.4.1",
     "@webpack-blocks/css-modules": "^0.4.0",
     "@webpack-blocks/dev-server2": "^0.4.0",
     "@webpack-blocks/extract-text2": "^0.4.0",
diff --git a/src/lib/prerender.js b/src/lib/prerender.js
index 7ddc2f77f..63f8d234d 100644
--- a/src/lib/prerender.js
+++ b/src/lib/prerender.js
@@ -9,6 +9,7 @@ export default function prerender(config, params) {
 
 	require('babel-register')({
 		babelrc: false,
+		ignore: false,
 		...createBabelConfig(config, { modules: 'commonjs' })
 	});
 
diff --git a/src/lib/webpack-config.js b/src/lib/webpack-config.js
index 58f64b6b9..445dc5935 100644
--- a/src/lib/webpack-config.js
+++ b/src/lib/webpack-config.js
@@ -14,7 +14,6 @@ import {
 	addPlugins,
 	setDevTool
 } from '@webpack-blocks/webpack2';
-import babel from '@webpack-blocks/babel6';
 import devServer from '@webpack-blocks/dev-server2';
 import ExtractTextPlugin from 'extract-text-webpack-plugin';
 import autoprefixer from 'autoprefixer';
@@ -97,14 +96,17 @@ export default env => {
 		}),
 
 		// ES2015
-		babel({
-			include(filepath) {
-				if (filepath.indexOf(src('.'))===0 || filepath.indexOf(resolve(__dirname, '../..'))===0 || filepath.split(/[/\\]/).indexOf('node_modules')===-1) return true;
-				let manifest = resolve(filepath.replace(/(.*([\/\\]node_modules|\.\.)[\/\\](@[^\/\\]+[\/\\])?[^\/\\]+)([\/\\].*)?$/g, '$1'), 'package.json'),
-					pkg = readJson(manifest) || {};
-				return !!(pkg.module || pkg['jsnext:main']);
-			},
-			...createBabelConfig(env)
+		customConfig({
+			module: {
+				loaders: [
+					{
+						enforce: 'pre',
+						test: /\.jsx?$/,
+						loader: 'babel-loader',
+						options: createBabelConfig(env)
+					}
+				]
+			}
 		}),
 
 		// automatic async components :)