diff --git a/codemirror/addon/lint/lint.js b/codemirror/addon/lint/lint.js
index 8e3fcb0e..5d54fa54 100644
--- a/codemirror/addon/lint/lint.js
+++ b/codemirror/addon/lint/lint.js
@@ -203,7 +203,7 @@
       if (state.options.tooltips != false)
         CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
 
-      startLinting(cm);
+      state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
     }
   });