diff --git a/.eslintrc b/.eslintrc
index eb6279f1..51a63cc0 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -13,5 +13,7 @@
         "semi": "error",
         "no-use-before-define": ["error", "nofunc"]
     },
-  "extends": ["eslint:recommended"]
+    "extends": [
+        "eslint:recommended"
+    ]
 }
diff --git a/.eslintrc.server b/.eslintrc.server
new file mode 100644
index 00000000..ab1bec31
--- /dev/null
+++ b/.eslintrc.server
@@ -0,0 +1,23 @@
+{
+    "env": {
+        "es6": true,
+        "node": true
+    },
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module"
+    },
+    "rules": {
+        "indent": ["error", 4],
+        "semi": "error",
+        "no-use-before-define": ["error", "nofunc"],
+        'no-process-exit': 0
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:node/recommended"
+    ],
+    "plugins": [
+        "node"
+    ]
+}
diff --git a/package.json b/package.json
index e634249d..2ee8685c 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,8 @@
     "cloudcmd": "bin/cloudcmd.js"
   },
   "config": {
-    "dirs": "bin server test webpack.config.js"
+    "dirs": "bin/cloudcmd.js server",
+    "dirs_dev": "test bin/release.js webpack.config.js"
   },
   "scripts": {
     "start": "node bin/cloudcmd.js",
@@ -51,7 +52,8 @@
     "lint": "redrun lint:*",
     "lint:css": "stylelint css/*.css",
     "lint:js": "redrun lint:js:*",
-    "lint:js:eslint:server": "eslint --rule 'no-console:0' $npm_package_config_dirs",
+    "lint:js:eslint:server": "eslint --rule 'no-console:0' -c .eslintrc.server $npm_package_config_dirs",
+    "lint:js:eslint:dev": "eslint --rule 'no-console:0' $npm_package_config_dirs_dev",
     "lint:js:jshint": "jshint bin client server",
     "lint:js:jscs": "jscs --esnext $npm_package_config_dirs",
     "lint:js:eslint:client": "eslint --rule 'no-console:0' --env browser client",
@@ -160,6 +162,7 @@
     "es6-promise": "^4.0.5",
     "es6-promisify": "^5.0.0",
     "eslint": "^4.0.0",
+    "eslint-plugin-node": "^5.1.0",
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^0.11.2",
     "gunzip-maybe": "^1.3.1",