diff --git a/.gitignore b/.gitignore
index 858a70386..68d303b3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@
 # bundler specific
 .gem
 .bundle
+
+# npm specific
+node_modules
diff --git a/.travis.yml b/.travis.yml
index d5387571b..da7e4a835 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,13 @@ language: ruby
 rvm:
 - 2.2.2
 
+install:
+- bundle  
+- . $HOME/.nvm/nvm.sh
+- nvm install 5.0
+- nvm use 5.0
+- npm install tldr-lint
+
 gemfile:
 - Gemfile
 
diff --git a/Makefile b/Makefile
index 8a506acbd..7ad4feaf7 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ prerequisites:
 	@echo "TL;DR:"
 	@echo "1. Install Ruby suitable for your system"
 	@echo "2. Run 'gem install bundler'"
+	@echo "3. Install npm for your system"
 	@echo
 
 hooks:
@@ -28,9 +29,11 @@ hooks:
 
 deps:
 	@bundle
+	@npm install tldr-lint
 	@echo "OK"
 
 lint:
 	@bundle exec mdl --style ./scripts/markdown-style.rb pages
+	@`pwd`/node_modules/.bin/tldr-lint ./pages
 
 .PHONY: default index setup prerequisites hooks deps lint