diff --git a/.eslintrc b/.eslintrc
index 64dcb316..dff941d1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -49,10 +49,11 @@
         "no-trailing-spaces": 2,
         "camelcase": 0,
         "no-extra-boolean-cast": 0,
+        "no-undef": 1,
 
         // Stylistic
         "indent": [2, 4],
         "max-len": [2, 80],
         "no-undefined": 2
     }
-}
\ No newline at end of file
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index a2b403e3..fc2f84e5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -149,7 +149,8 @@ module.exports = function (grunt) {
                         dir.theme + '/custom/',
                         dir.theme + '/storyboard/',
                         dir.bower + '/bootstrap/less/',
-                        dir.bower + '/font-awesome/less/'
+                        dir.bower + '/font-awesome/less/',
+                        dir.bower + '/highlightjs/styles/'
                     ];
                 },
                 cleancss: true,
diff --git a/bower.json b/bower.json
index 92e307d5..e5c4c7bd 100644
--- a/bower.json
+++ b/bower.json
@@ -13,7 +13,9 @@
     "angular-elastic": "2.4.2",
     "angular-moment": "0.9.0",
     "angular-cache": "3.2.5",
-    "angularjs-viewhead": "0.0.1"
+    "angularjs-viewhead": "0.0.1",
+    "marked": "0.3.4",
+    "highlightjs": "8.4"
   },
   "devDependencies": {
     "angular-mocks": "1.3.13",
diff --git a/src/app/projects/template/detail.html b/src/app/projects/template/detail.html
index 2980b633..4b00bf9a 100644
--- a/src/app/projects/template/detail.html
+++ b/src/app/projects/template/detail.html
@@ -46,9 +46,9 @@
         </small>
     </h1>
     <p>
-        <span ng-show="project.description"
-              class="honor-carriage-return">{{project.description}}
-        </span>
+        <insert-markdown ng-if="project.description && !isLoading"
+                         content="project.description">
+        </insert-markdown>
         <em ng-hide="project.description" class="text-muted">
             No description provided
         </em>
diff --git a/src/app/services/directive/markdown.js b/src/app/services/directive/markdown.js
new file mode 100644
index 00000000..f39e190f
--- /dev/null
+++ b/src/app/services/directive/markdown.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2015 Codethink Limited.
+ *
+ * Licensed under the Apache License, Version 2.0 (the 'License'); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Service for rendering text as markdown.
+ */
+angular.module('sb.services')
+    .directive('insertMarkdown', function($sanitize) {
+        'use strict';
+
+        return {
+            restrict: 'E',
+            scope: {
+                content: '='
+            },
+            link: function(scope, elem) {
+                scope.$watch('content', function(newVal) {
+                    elem.html('<div>' + $sanitize(marked(newVal)) + '</div>');
+                }, true);
+            }
+        };
+    });
diff --git a/src/app/stories/template/comments/user_comment.html b/src/app/stories/template/comments/user_comment.html
index 30672b9c..35e4bc98 100644
--- a/src/app/stories/template/comments/user_comment.html
+++ b/src/app/stories/template/comments/user_comment.html
@@ -4,9 +4,9 @@
         <span time-moment eventdate="event.created_at" class="pull-right"></span>
     </p>
 
-    <p ng-show="event.comment.content"
-       class="honor-carriage-return">{{event.comment.content}}
-    </p>
+    <insert-markdown ng-show="event.comment.content"
+       content="event.comment.content">
+    </insert-markdown>
 
     <p><em ng-hide="event.comment.content"
            class="text-muted">
diff --git a/src/app/stories/template/detail.html b/src/app/stories/template/detail.html
index 0b529584..d876a8da 100644
--- a/src/app/stories/template/detail.html
+++ b/src/app/stories/template/detail.html
@@ -38,7 +38,6 @@
 <!-- Template for the header and description -->
 <script type="text/ng-template" id="/inline/story_detail.html">
     <h1>
-
         <span ng-show="story.title" view-title>
             {{story.title}}
         </span>
@@ -51,12 +50,7 @@
                 <i class="fa fa-pencil"></i>
             </a>
             <subscribe resource="story"
-                    resource-id="story.id"></subscribe>
-            <button type="button"
-                    class="btn btn-link"
-                    ng-click="remove()" permission="is_superuser">
-                Remove this story
-            </button>
+                   resource-id="story.id"></subscribe>
         </small>
     </h1>
     <p><strong>Author:</strong>
@@ -78,9 +72,9 @@
         </em>
     </p>
     <p>
-        <span ng-show="story.description"
-              class="honor-carriage-return">{{story.description}}
-        </span>
+        <insert-markdown ng-show="story.description"
+                         content="story.description">
+        </insert-markdown>
         <em ng-hide="story.description" class="text-muted">
             No description provided
         </em>
diff --git a/src/app/stories/template/story_list_item.html b/src/app/stories/template/story_list_item.html
index e63167b5..355c19da 100644
--- a/src/app/stories/template/story_list_item.html
+++ b/src/app/stories/template/story_list_item.html
@@ -24,8 +24,9 @@
             </a>
         </strong>
         <br/>
-        <small class="text-muted honor-carriage-return"
-               ng-show="expandRow">{{story.description}}
+        <small class="text-muted"
+               ng-show="expandRow">
+               <insert-markdown content="story.description"></insert-markdown>
         </small>
     </p>
 </td>
diff --git a/src/app/storyboard/module.js b/src/app/storyboard/module.js
index 32406b4a..9b16ba97 100644
--- a/src/app/storyboard/module.js
+++ b/src/app/storyboard/module.js
@@ -27,7 +27,7 @@ angular.module('storyboard',
         'sb.auth', 'sb.story', 'sb.profile', 'sb.notification', 'sb.search',
         'sb.admin', 'sb.subscription', 'sb.project_group', 'ui.router',
         'ui.bootstrap', 'monospaced.elastic', 'angularMoment',
-        'angular-data.DSCacheFactory', 'viewhead'])
+        'angular-data.DSCacheFactory', 'viewhead', 'ngSanitize'])
     .constant('angularMomentConfig', {
         preprocess: 'utc',
         timezone: 'UTC'
@@ -62,6 +62,13 @@ angular.module('storyboard',
                     preferences: PreferenceResolver.resolvePreferences
                 }
             });
+
+        // Set up syntax highlighting for the markdown parser
+        marked.setOptions({
+            highlight: function (code) {
+                return hljs.highlightAuto(code).value;
+            }
+        });
     })
     .run(function ($log, $rootScope, $document) {
         'use strict';
diff --git a/src/index.html b/src/index.html
index eac8474c..162fda92 100644
--- a/src/index.html
+++ b/src/index.html
@@ -39,6 +39,8 @@
     <script src="moment/moment.js"></script>
     <script src="angular-moment/angular-moment.js"></script>
     <script src="angularjs-viewhead/angularjs-viewhead.js"></script>
+    <script src="marked/marked.min.js"></script>
+    <script src="highlightjs/highlight.pack.js"></script>
     <!-- endbuild -->
 
     <link rel="stylesheet" href="styles/main.css">
diff --git a/src/theme/base/discussion.less b/src/theme/base/discussion.less
index 2af5ad5f..86a6acad 100644
--- a/src/theme/base/discussion.less
+++ b/src/theme/base/discussion.less
@@ -36,7 +36,7 @@
             padding: @table-condensed-cell-padding;
         }
 
-        > p {
+        > insert-markdown > div, > p {
             padding: @table-cell-padding;
             padding-bottom: 0px;
         }
diff --git a/src/theme/main.less b/src/theme/main.less
index f599407e..1b353f56 100644
--- a/src/theme/main.less
+++ b/src/theme/main.less
@@ -24,6 +24,7 @@
 @import './bootstrap.less';
 @import './base/bootstrap/navbar.less';
 @import './font-awesome.less';
+@import (less) './default.css';
 
 // Theme
 @import './theme.less';