diff --git a/.jshintconfig b/.jshintrc
similarity index 100%
rename from .jshintconfig
rename to .jshintrc
diff --git a/.travis.yml b/.travis.yml
index 30d3d8342..d3425de85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ before_install:
   - ls -la bin/phantomjs190
 
 before_script:
-  - "npm install -g jshint@1.1.0"
+  - "npm install -g jshint@2.0.1"
   - bin/phantomjs182 --version
   - bin/phantomjs190 --version
 
diff --git a/Makefile b/Makefile
index 9ddb6f6fb..625ebe4e6 100644
--- a/Makefile
+++ b/Makefile
@@ -14,4 +14,4 @@ clitest:
 	python tests/clitests/runtests.py
 
 jshint:
-	jshint --config=.jshintconfig .
+	jshint .