@@ -37,6 +37,9 @@ are:
   - tools/closure_linter is copyrighted by The Closure Linter Authors and
     Google Inc and is released under the Apache license.
 
+  - tools/cpplint.py is copyrighted by Google Inc and is released under the
+    BSD license.
+
 
 Node's license follows:
 
 
@@ -130,11 +130,18 @@ bench-idle:
 	sleep 1
 	./node benchmark/idle_clients.js &
 
-lint:
+# TODO lint the test directories and src/node.js
+jslint:
 	@for i in lib/*.js; do \
 	  PYTHONPATH=tools/closure_linter/ python tools/closure_linter/closure_linter/gjslint.py \
 	    --unix_mode --strict --nojsdoc $$i || exit 1; \
 	done
 
+cpplint:
+	@for i in src/*.cc src/*.h src/*.c; do \
+	  python tools/cpplint.py $$i || exit 1; \
+	done
+
+lint: jslint cpplint
 
-.PHONY: lint bench clean docopen docclean doc dist distclean check uninstall install all program staticlib dynamiclib test test-all website-upload
+.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean check uninstall install all program staticlib dynamiclib test test-all website-upload