diff --git a/Makefile b/Makefile
index 577d0e232a..387be35f17 100644
--- a/Makefile
+++ b/Makefile
@@ -786,7 +786,7 @@ cpplint:
 	@$(PYTHON) tools/cpplint.py $(CPPLINT_FILES)
 	@$(PYTHON) tools/check-imports.py
 
-ifneq ("","$(wildcard tools/eslint/bin/eslint.js)")
+ifneq ("","$(wildcard tools/eslint/)")
 lint:
 	@EXIT_STATUS=0 ; \
 	$(MAKE) jslint || EXIT_STATUS=$$? ; \
@@ -807,7 +807,6 @@ lint:
 	@echo "Linting is not available through the source tarball."
 	@echo "Use the git repo instead:" \
 		"$ git clone https://github.com/nodejs/node.git"
-	exit 1
 
 lint-ci: lint
 endif
diff --git a/vcbuild.bat b/vcbuild.bat
index 502f1d0ec2..70f94cf014 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -396,7 +396,7 @@ goto exit
 :jslint
 if defined jslint_ci goto jslint-ci
 if not defined jslint goto exit
-if not exist tools\eslint\bin\eslint.js goto no-lint
+if not exist tools\eslint goto no-lint
 echo running jslint
 %config%\node tools\eslint\bin\eslint.js --cache --rule "linebreak-style: 0" --rulesdir=tools\eslint-rules --ext=.js,.md benchmark doc lib test tools
 goto exit
@@ -409,7 +409,7 @@ goto exit
 :no-lint
 echo Linting is not available through the source tarball.
 echo Use the git repo instead: $ git clone https://github.com/nodejs/node.git
-exit /b 1
+goto exit
 
 :create-msvs-files-failed
 echo Failed to create vc project files.