diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 00000000..a5a4a173
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,3 @@
+{
+  "extends": "gulp"
+}
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index af7124ee..00000000
--- a/.jshintrc
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "camelcase": true,
-  "curly": true,
-  "eqeqeq": true,
-  "freeze": true,
-  "indent": 2,
-  "newcap": false,
-  "quotmark": "single",
-  "maxdepth": 3,
-  "maxstatements": 50,
-  "maxlen": 80,
-  "eqnull": true,
-  "funcscope": true,
-  "strict": true,
-  "undef": true,
-  "unused": true,
-  "node": true,
-  "mocha": true
-}
\ No newline at end of file
diff --git a/package.json b/package.json
index dc4318ff..7f89f6d7 100644
--- a/package.json
+++ b/package.json
@@ -2,28 +2,10 @@
   "name": "gulp-cli",
   "description": "The streaming build system",
   "version": "0.3.0",
-  "homepage": "http://gulpjs.com",
-  "repository": "gulpjs/gulp-cli",
   "author": "Fractal <contact@wearefractal.com> (http://wearefractal.com/)",
-  "tags": [
-    "build",
-    "stream",
-    "system",
-    "make",
-    "tool",
-    "asset",
-    "pipeline"
-  ],
-  "files": [
-    "index.js",
-    "lib",
-    "bin",
-    "completion"
-  ],
   "bin": {
     "gulp": "bin/gulp.js"
   },
-  "man": "gulp.1",
   "dependencies": {
     "archy": "^1.0.0",
     "chalk": "^1.1.0",
@@ -39,22 +21,41 @@
   "devDependencies": {
     "code": "^1.2.1",
     "coveralls": "^2.7.0",
+    "eslint": "^1.7.3",
+    "eslint-config-gulp": "^2.0.0",
     "gulp": ">=3.8.10",
     "jscs": "^2.3.5",
     "jscs-preset-gulp": "^1.0.0",
-    "jshint": "^2.5.0",
-    "jshint-stylish": "^2.0.1",
     "lab": "^5.1.0",
     "marked-man": "^0.1.3"
   },
-  "scripts": {
-    "prepublish": "marked-man --name gulp docs/CLI.md > gulp.1",
-    "lint": "jshint lib index.js --reporter node_modules/jshint-stylish --exclude node_modules && jscs index.js lib bin test",
-    "test": "npm run lint && lab -cv",
-    "coveralls": "lab -r lcov | coveralls"
-  },
   "engines": {
     "node": ">= 0.9"
   },
-  "license": "MIT"
+  "files": [
+    "index.js",
+    "lib",
+    "bin",
+    "completion"
+  ],
+  "homepage": "http://gulpjs.com",
+  "license": "MIT",
+  "man": "gulp.1",
+  "repository": "gulpjs/gulp-cli",
+  "scripts": {
+    "coveralls": "lab -r lcov | coveralls",
+    "lint": "eslint . && jscs index.js bin/ lib/ test/",
+    "prepublish": "marked-man --name gulp docs/CLI.md > gulp.1",
+    "pretest": "npm run lint",
+    "test": "lab -cv"
+  },
+  "tags": [
+    "build",
+    "stream",
+    "system",
+    "make",
+    "tool",
+    "asset",
+    "pipeline"
+  ]
 }
diff --git a/test/.eslintrc b/test/.eslintrc
new file mode 100644
index 00000000..06b940f7
--- /dev/null
+++ b/test/.eslintrc
@@ -0,0 +1,3 @@
+{
+  "extends": "gulp/test"
+}