diff --git a/UI/WebServerResources/Gruntfile.js b/UI/WebServerResources/Gruntfile.js
index 4922a9a8d..221fb5747 100644
--- a/UI/WebServerResources/Gruntfile.js
+++ b/UI/WebServerResources/Gruntfile.js
@@ -55,16 +55,20 @@ module.exports = function(grunt) {
         src: 'css/styles.css'
       }
     },
-    concat_sourcemap: {
+    jshint: {
+      files: [].concat(Object.keys(js_files).map(function(v) { return js_files[v]; }))
+    },
+    uglify: {
+      options: {
+        sourceMap: true
+      },
       dist: {
-        options: {
-          sourcesContent: false
-        },
         files: js_files
       },
       dev: {
         options: {
-          sourcesContent: true
+          mangle: false,
+          sourceMapIncludeSources: true
         },
         files: js_files
       }
@@ -86,7 +90,8 @@ module.exports = function(grunt) {
 
   grunt.loadNpmTasks('grunt-sass');
   grunt.loadNpmTasks('grunt-postcss');
-  grunt.loadNpmTasks('grunt-concat-sourcemap');
+  grunt.loadNpmTasks('grunt-contrib-jshint');
+  grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-watch');
 
   grunt.task.registerTask('static', function() {
@@ -151,10 +156,10 @@ module.exports = function(grunt) {
     }
     */
   });
-  grunt.task.registerTask('build', ['static', 'concat_sourcemap:dist', 'sass:dist', 'postcss:dist']);
+  grunt.task.registerTask('build', ['static', 'uglify:dist', 'sass:dist', 'postcss:dist']);
   // Tasks for developers
   grunt.task.registerTask('default', ['watch']);
   grunt.task.registerTask('css', ['sass:dev', 'postcss:dev']);
-  grunt.task.registerTask('js', ['concat_sourcemap:dev']);
+  grunt.task.registerTask('js', ['jshint', 'uglify:dev']);
   grunt.task.registerTask('dev', ['css', 'js']);
 };
diff --git a/UI/WebServerResources/package.json b/UI/WebServerResources/package.json
index 5853de2f7..7ab99d8cb 100644
--- a/UI/WebServerResources/package.json
+++ b/UI/WebServerResources/package.json
@@ -7,7 +7,8 @@
     "csswring": ">=3.0.0",
     "grunt": ">=0.4.1",
     "grunt-cli": ">=0.1.11",
-    "grunt-concat-sourcemap": ">=0.4.3",
+    "grunt-contrib-jshint": ">=0.11.2",
+    "grunt-contrib-uglify": ">=0.9",
     "grunt-contrib-watch": ">=0.5.3",
     "grunt-ng-annotate": ">=0.10.0",
     "grunt-postcss": "^0.3.0",