diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000000..a8e18932fd
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,4 @@
+{
+    "validthis": true,
+    "laxbreak": true
+}
diff --git a/gulpfile.js b/gulpfile.js
index 89662075e9..abfef397b1 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -25,13 +25,15 @@ var gulp = require('gulp'),
     requirejsOptimize = require('gulp-requirejs-optimize'),
     sourcemaps = require('gulp-sourcemaps'),
     compass = require('gulp-compass'),
+    jshint = require('gulp-jshint'),
     karma = require('karma'),
     path = require('path'),
     paths = {
         main: 'main.js',
         dist: 'dist',
         assets: 'dist/assets',
-        scss: 'platform/**/*.scss'
+        scss: 'platform/**/*.scss',
+        scripts: [ 'main.js', 'platform/**/*.js', 'src/**/*.js' ]
     },
     options = {
         requirejsOptimize: {
@@ -65,3 +67,10 @@ gulp.task('stylesheets', function () {
         .pipe(compass(options.compass))
         .pipe(gulp.dest(paths.assets));
 });
+
+gulp.task('lint', function () {
+    return gulp.src(paths.scripts)
+        .pipe(jshint())
+        .pipe(jshint.reporter('default'))
+        .pipe(jshint.reporter('fail'));
+});
diff --git a/package.json b/package.json
index 6562532386..46c8276fba 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "glob": ">= 3.0.0",
     "gulp": "^3.9.0",
     "gulp-compass": "^2.1.0",
+    "gulp-jshint": "^2.0.0",
     "gulp-requirejs-optimize": "^0.3.1",
     "gulp-sourcemaps": "^1.6.0",
     "jasmine-core": "^2.3.0",