diff --git a/lib/marked.js b/lib/marked.js
index dbcd573a0b..9af989ce78 100644
--- a/lib/marked.js
+++ b/lib/marked.js
@@ -378,7 +378,7 @@ Lexer.prototype.token = function(src, top, bq) {
     }
 
     // task (gfm)
-    if (top && (cap = this.rules.task.exec(src)) {
+    if (top && (cap = this.rules.task.exec(src))) {
       src = src.substring(cap[0].length);
 
       this.tokens.push({
@@ -806,6 +806,21 @@ Renderer.prototype.code = function(code, lang, escaped) {
     + '\n</code></pre>\n';
 };
 
+Renderer.prototype.tasklist = function(text) {
+  return '<ul class="task-list">\n' + text + '</ul>\n';
+};
+
+Renderer.prototype.taskitem = function(text, checked, disabled, i) {
+  return '<li class="task-list-item"><label>'
+    + '<input type="checkbox"'
+    + ' class="task-list-item-checkbox"'
+    + ' data-item-index="' + i + '"'
+    + ' data-item-complete="' + (checked ? 1 : 0) + '"'
+    + (disabled ? ' disabled=""' : '') + '>'
+    + ' ' + text
+    + '</label></li>';
+};
+
 Renderer.prototype.blockquote = function(quote) {
   return '<blockquote>\n' + quote + '</blockquote>\n';
 };
@@ -1014,19 +1029,14 @@ Parser.prototype.tok = function() {
         , i = 1;
 
       while (this.next().type !== 'task_list_end') {
-        body += '<li class="task-list-item"><label>'
-          + '<input type="checkbox"'
-          + ' class="task-list-item-checkbox"
-          + ' data-item-index="' + (i++) + '"'
-          + ' data-item-complete="' + (this.token.checked ? 1 : 0) + '"'
-          + ' ' + (this.token.disabled ? 'disabled=""' + '') + '>'
-          + ' ' + this.inline.output(this.token.text)
-          + '</label></li>';
+        body += this.renderer.taskitem(
+          this.inline.output(this.token.text),
+          this.token.checked,
+          this.token.disabled,
+          i++);
       }
 
-      return '<ul class="task-list">'
-        + body
-        + '</ul>';
+      return this.renderer.tasklist(body);
     }
     case 'table': {
       var header = ''