diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee
index dd35d9178..28077fa37 100644
--- a/build/Gruntfile.coffee
+++ b/build/Gruntfile.coffee
@@ -269,6 +269,9 @@ module.exports = (grunt) ->
         configFile: 'build/config/eslint.json'
       target: ES_SRC
 
+    eslintFixer:
+      src: ES_SRC
+
     csslint:
       options:
         'adjoining-classes': false
diff --git a/build/tasks/eslint-fixer-task.coffee b/build/tasks/eslint-fixer-task.coffee
new file mode 100644
index 000000000..4a40ee417
--- /dev/null
+++ b/build/tasks/eslint-fixer-task.coffee
@@ -0,0 +1,17 @@
+fs = require('fs')
+
+module.exports = (grunt) ->
+  grunt.registerMultiTask "eslintFixer", "Fixes eslint issues", ->
+    done = @async()
+    for fileset in @files
+      for file in fileset.src
+        content = fs.readFileSync(file, encoding: "utf8")
+        re1 = /(.*[^ ])=> (.*)/g
+        re2 = /(.*) =>([^ ].*)/g
+        eolRe = /\ +$/gm
+        replacer = (fullMatch, parens, rest) ->
+          return "#{parens} => #{rest}"
+        newContent = content.replace(re1, replacer)
+        newContent = newContent.replace(re2, replacer)
+        newContent = newContent.replace(eolRe, "")
+        fs.writeFileSync(file, newContent, encoding: 'utf8')
diff --git a/build/tasks/nylaslint-task.coffee b/build/tasks/nylaslint-task.coffee
index a40a39f4d..afc7adb1b 100644
--- a/build/tasks/nylaslint-task.coffee
+++ b/build/tasks/nylaslint-task.coffee
@@ -44,7 +44,7 @@ module.exports = (grunt) ->
           errors.push("#{f}: Spec has to start with function")
           ## NOTE: Comment me in if you want to fix these files.
           # _str = require('underscore.string')
-          # replacer = (match, describeName, offset, string) ->
+          # replacer = (match, describeName) ->
           #   fnName = _str.camelize(describeName, true)
           #   return "\ndescribe('#{describeName}', function #{fnName}() "
           # newContent = content.replace(describeRe, replacer)