diff --git a/requirements.txt b/requirements.txt
index 4b310c5..87bac65 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,3 +13,4 @@ djangorestframework-hstore==1.3
 pyldap==2.4.28
 requests==2.16.5
 urllib3==1.21.1
+django_markdown2==0.3.0
diff --git a/spejstore/settings.py b/spejstore/settings.py
index 93ec4c7..afbc249 100644
--- a/spejstore/settings.py
+++ b/spejstore/settings.py
@@ -43,6 +43,7 @@ INSTALLED_APPS = [
     'tree',
     'django_select2',
     'rest_framework',
+    'django_markdown2',
 
     'storage',
 ]
diff --git a/storage/templates/item.html b/storage/templates/item.html
index 31c4c82..03401c7 100644
--- a/storage/templates/item.html
+++ b/storage/templates/item.html
@@ -71,7 +71,10 @@
         </div>
 
         <div class="col-md-8">
-            {{ item.description|urlize }}
+            {% if item.description %}
+            {% load md2 %}
+            {{ item.description|markdown:"code-color" }}
+            {% endif %}
 
             <h3>Children</h3>
             <table class="table table-striped table-hover">