diff --git a/plugin/syntastic/registry.vim b/plugin/syntastic/registry.vim
index 08929b7c..4065511a 100644
--- a/plugin/syntastic/registry.vim
+++ b/plugin/syntastic/registry.vim
@@ -5,6 +5,7 @@ let g:loaded_syntastic_registry=1
 
 let s:defaultCheckers = {
         \ 'c': ['gcc'],
+        \ 'coffee': ['coffee', 'coffeelint'],
         \ 'cpp': ['gcc'],
         \ 'html': ['tidy'],
         \ 'java': ['javac'],
diff --git a/syntax_checkers/coffee/coffee.vim b/syntax_checkers/coffee/coffee.vim
index 26758798..d496ee90 100644
--- a/syntax_checkers/coffee/coffee.vim
+++ b/syntax_checkers/coffee/coffee.vim
@@ -9,15 +9,8 @@
 "             See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 "============================================================================
-
-
-if !exists('g:syntastic_coffee_lint_options')
-    let g:syntastic_coffee_lint_options = ""
-endif
-
-
 function! SyntaxCheckers_coffee_coffee_IsAvailable()
-    return executable("coffee") && executable('coffeelint')
+    return executable("coffee")
 endfunction
 
 function! SyntaxCheckers_coffee_coffee_GetLocList()
@@ -26,24 +19,7 @@ function! SyntaxCheckers_coffee_coffee_GetLocList()
                 \ 'args': '-c -l -o /tmp' })
     let errorformat =  'Syntax%trror: In %f\, %m on line %l,%EError: In %f\, Parse error on line %l: %m,%EError: In %f\, %m on line %l,%W%f(%l): lint warning: %m,%-Z%p^,%W%f(%l): warning: %m,%-Z%p^,%E%f(%l): SyntaxError: %m,%-Z%p^,%-G%.%#'
 
-    let coffee_results = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
-
-    if !empty(coffee_results)
-        return coffee_results
-    endif
-
-    if executable("coffeelint")
-        return s:GetCoffeeLintErrors()
-    endif
-
-    return []
-endfunction
-
-function s:GetCoffeeLintErrors()
-    let coffeelint = 'coffeelint --csv '.g:syntastic_coffee_lint_options.' '.shellescape(expand('%'))
-    let lint_results = SyntasticMake({ 'makeprg': coffeelint, 'errorformat': '%f\,%l\,%trror\,%m', 'subtype': 'Style' })
-
-    return lint_results
+    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
diff --git a/syntax_checkers/coffee/coffeelint.vim b/syntax_checkers/coffee/coffeelint.vim
new file mode 100644
index 00000000..65c34701
--- /dev/null
+++ b/syntax_checkers/coffee/coffeelint.vim
@@ -0,0 +1,30 @@
+"============================================================================
+"File:        coffeelint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Lincoln Stoll <l@lds.li>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+if !exists('g:syntastic_coffee_lint_options')
+    let g:syntastic_coffee_lint_options = ""
+endif
+
+function! SyntaxCheckers_coffee_coffeelint_IsAvailable()
+    return executable('coffeelint')
+endfunction
+
+function! SyntaxCheckers_coffee_coffeelint_GetLocList()
+    let makeprg = syntastic#makeprg#build({
+                \ 'exe': 'coffeelint',
+                \ 'args': '--csv' })
+    let efm = '%f\,%l\,%trror\,%m'
+    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': efm, 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'coffee',
+    \ 'name': 'coffeelint'})