diff --git a/nyaa/static/js/main.js b/nyaa/static/js/main.js
index b9c140b..63f32c5 100644
--- a/nyaa/static/js/main.js
+++ b/nyaa/static/js/main.js
@@ -105,8 +105,13 @@ document.addEventListener("DOMContentLoaded", function() {
     var previewTabEl = markdownEditor.querySelector(previewTabSelector);
     var targetEl = markdownEditor.querySelector(targetSelector);
 
+    var reader = new commonmark.Parser({safe: true});
+    var writer = new commonmark.HtmlRenderer({safe: true});
+    writer.softbreak = '<br />';
+
     previewTabEl.addEventListener('click', function () {
-      targetEl.innerHTML = marked(sourceSelector.value.trim(), { sanitize: true, breaks:true });
+      var parsed = reader.parse(sourceSelector.value.trim());
+      targetEl.innerHTML = writer.render(parsed);
     });
   });
 });
diff --git a/nyaa/templates/layout.html b/nyaa/templates/layout.html
index 806c0bc..9f91979 100644
--- a/nyaa/templates/layout.html
+++ b/nyaa/templates/layout.html
@@ -35,7 +35,7 @@
 		<!-- Modified to not apply border-radius to selectpickers and stuff so our navbar looks cool -->
 		<script src="/static/js/bootstrap-select.js"></script>
 		<script src="/static/js/main.js"></script>
-		<script src="//cdnjs.cloudflare.com/ajax/libs/marked/0.3.6/marked.min.js"></script>
+		<script src="//cdnjs.cloudflare.com/ajax/libs/commonmark/0.27.0/commonmark.min.js"></script>
 
 		<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
 		<!--[if lt IE 9]>
diff --git a/nyaa/templates/view.html b/nyaa/templates/view.html
index fd64979..4626a70 100644
--- a/nyaa/templates/view.html
+++ b/nyaa/templates/view.html
@@ -122,8 +122,11 @@
 <script>
 	var target = document.getElementById('torrent-description');
 	var text = target.innerHTML;
-	var html = marked(text.trim(), { sanitize: true, breaks:true });
-	target.innerHTML = html;
+	var reader = new commonmark.Parser({safe: true});
+	var writer = new commonmark.HtmlRenderer({safe: true});
+	writer.softbreak = '<br />';
+	var parsed = reader.parse(text.trim());
+	target.innerHTML = writer.render(parsed);
 </script>
 
 {% endblock %}