diff --git a/.gitignore b/.gitignore
index 19fe9bb4b..e3b12347e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 .sass-cache
+build
 dist
 node_modules
 src/scripts/views.js
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index e9356d034..055179fa8 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -40,6 +40,7 @@ module.exports = (grunt)->
 
         clean:
             dist: ['./dist']
+            build: ['./build']
 
         copy:
             data:
@@ -101,11 +102,27 @@ module.exports = (grunt)->
                 files:
                     './src/scripts/views.js': ['./src/templates/**/*.jade']
 
+        rename:
+            scripts:
+                src: './dist/js'
+                dest: './build/js'
+
         sass:
             main:
                 files:
                     './dist/css/main.css': ['./src/css/main.scss']
 
+        uglify:
+            scripts:
+                options:
+                    maxLineLen: 20
+                files: [
+                    expand: true
+                    cwd: './build/js'
+                    src: '**/*.js'
+                    dest: './dist/js'
+                ]
+
         watch:
             data:
                 files: ['./src/data/**/*']
@@ -134,4 +151,6 @@ module.exports = (grunt)->
 
     grunt.registerTask 'default', 'build'
 
-    grunt.registerTask 'build', ['copy', 'sass', 'jade', 'browserify', 'exorcise']
+    grunt.registerTask 'build', [ 'copy', 'sass', 'jade', 'browserify', 'exorcise' ]
+
+    grunt.registerTask 'dist', ['clean', 'build', 'rename:scripts', 'uglify']
diff --git a/package.json b/package.json
index 5ad7ada93..c2ed9ec2c 100644
--- a/package.json
+++ b/package.json
@@ -25,8 +25,10 @@
     "grunt-contrib-copy": "^0.7.0",
     "grunt-contrib-jade": "^0.13.0",
     "grunt-contrib-sass": "^0.8.1",
+    "grunt-contrib-uglify": "^0.7.0",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-exorcise": "^0.2.0",
+    "grunt-rename": "^0.1.4",
     "underscore": "^1.7.0"
   },
   "dependencies": {