diff --git a/package.json b/package.json
index 2ee708d..622bdf5 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
   },
   "scripts": {
     "lint": "eslint",
-    "dev": "NODE_ENV=development node --harmony ./webpack/dev-server.js",
-    "serve": "NODE_ENV=development webpack-dev-server --config webpack.config.js",
+    "dev": "node --harmony ./webpack/dev-server.js",
+    "serve": "webpack-dev-server --config webpack/dev.config.js",
     "build": "NODE_ENV=development CLEANDIST=true webpack --config webpack.config.js --progress",
     "build:quiet": "NODE_ENV=development CLEANDIST=true webpack --config webpack.config.js --bail",
     "deploy": "NODE_ENV=production CLEANDIST=true webpack --config webpack.config.js --progress",
diff --git a/webpack.config.js b/webpack.config.js
index e263ccd..cb6c7e4 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -10,7 +10,7 @@ function get_config() {
     case 'production':
       return 'prod.config.js';
     default:
-      return 'dev.config.js';
+      return 'base.config.js';
   }
 }
 
diff --git a/webpack/dev.config.js b/webpack/dev.config.js
index 7ecb55d..9fe03cc 100644
--- a/webpack/dev.config.js
+++ b/webpack/dev.config.js
@@ -3,7 +3,7 @@ require('babel-register');
 console.log('Building with dev.config.js\n');
 var webpack = require('webpack');
 
-const config = require('./base.config');
+const config = require('../webpack.config.js');
 
 const PUBLIC_PATH = config.output.publicPath;