diff --git a/package.json b/package.json
index 85dec3096..b59587873 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "plist": "git://github.com/nathansobo/node-plist.git",
     "space-pen": "git://github.com/nathansobo/space-pen.git",
     "less": "git://github.com/nathansobo/less.js.git",
+    "roaster": "0.0.3",
     "jqueryui-browser": "1.10.2-1"
   },
 
diff --git a/src/packages/markdown-preview/lib/markdown-preview-view.coffee b/src/packages/markdown-preview/lib/markdown-preview-view.coffee
index 9b336cc2e..433cbb565 100644
--- a/src/packages/markdown-preview/lib/markdown-preview-view.coffee
+++ b/src/packages/markdown-preview/lib/markdown-preview-view.coffee
@@ -1,6 +1,7 @@
 $ = require 'jquery'
 ScrollView = require 'scroll-view'
 {$$$} = require 'space-pen'
+roaster = require 'roaster'
 
 module.exports =
 class MarkdownPreviewView extends ScrollView
@@ -59,15 +60,11 @@ class MarkdownPreviewView extends ScrollView
   setLoading: ->
     @html($$$ -> @div class: 'markdown-spinner', 'Loading Markdown...')
 
-  fetchRenderedMarkdown: (text) ->
+  fetchRenderedMarkdown: ->
     @setLoading()
-    $.ajax
-      url: 'https://api.github.com/markdown'
-      type: 'POST'
-      dataType: 'html'
-      contentType: 'application/json; charset=UTF-8'
-      data: JSON.stringify
-        mode: 'markdown'
-        text: @buffer.getText()
-      success: (html) => @html(html)
-      error: (result) => @setErrorHtml(result)
+    roaster(@buffer.getText(), {}, (err, html) =>
+      if err
+        @setErrorHtml(err)
+      else
+        @html(html)
+    )