diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000..5eaf123
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,10 @@
+# Support ES2016 features
+parser: babel-eslint
+
+extends: standard
+
+rules:
+  eqeqeq: 0
+  semi: [2, always]
+  space-before-function-paren: [2, never]
+  yoda: 0
diff --git a/Makefile b/Makefile
index 7a089f6..a65b8da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
 SRC = lib/*.js
 
-include node_modules/make-lint/index.mk
-
 REQUIRED = --require should --require should-http
 
 TESTS = test/application/* \
@@ -10,6 +8,9 @@ TESTS = test/application/* \
 	test/response/* \
 	test/experimental/index.js
 
+lint:
+	@./node_modules/.bin/eslint lib test
+
 test:
 	@NODE_ENV=test node \
 		./node_modules/.bin/_mocha \
@@ -26,7 +27,7 @@ test-cov:
 		$(TESTS) \
 		--bail
 
-test-travis:
+test-travis: lint
 	@NODE_ENV=test node \
 		./node_modules/.bin/istanbul cover \
 		./node_modules/.bin/_mocha \
@@ -39,4 +40,4 @@ test-travis:
 bench:
 	@$(MAKE) -C benchmarks
 
-.PHONY: test bench
+.PHONY: lint test bench
diff --git a/package.json b/package.json
index 6b5f513..8bca4f6 100644
--- a/package.json
+++ b/package.json
@@ -44,8 +44,11 @@
   },
   "devDependencies": {
     "babel": "^5.0.0",
+    "babel-eslint": "^4.1.3",
+    "eslint": "^1.6.0",
+    "eslint-config-standard": "^4.4.0",
+    "eslint-plugin-standard": "^1.3.1",
     "istanbul": "^0.3.22",
-    "make-lint": "^1.0.1",
     "mocha": "^2.0.1",
     "should": "^6.0.3",
     "should-http": "0.0.3",
diff --git a/test/.eslintrc b/test/.eslintrc
new file mode 100644
index 0000000..cda2f26
--- /dev/null
+++ b/test/.eslintrc
@@ -0,0 +1,5 @@
+env:
+  mocha: true
+
+rules:
+  space-before-blocks: [2, {functions: never, keywords: always}]