diff --git a/AUTHORS b/AUTHORS
index 8da3d20b47..0add924dd4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,12 +1,13 @@
 Here is an inevitably incomplete list of much-appreciated contributors --
 people who have submitted patches, reported bugs, added translations, helped
-answer newbie questions, improved the documentation, and generally made pretix 
+answer newbie questions, improved the documentation, and generally made pretix
 an awesome project. Thank you all!
 
 	Alexander Brock <Brock.Alexander@web.de>
 	Ben Oswald
 	Christian Franke <nobody@nowhere.ws>
 	informancer <informancer@web.de>
+    Flavia Bastos
 	Jason Estibeiro <jasonestibeiro@live.com>
 	Jan Weiß
 	Jonas Große Sundrup <cherti@letopolis.de>
@@ -16,4 +17,3 @@ an awesome project. Thank you all!
 	Team MRMCD
 	Tobias Kunze <rixx@cutebit.de>
 	Oliver Knapp <github@oliverknapp.de>
-
diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html
index 8b5352ee26..9629b976e4 100644
--- a/src/pretix/presale/templates/pretixpresale/event/index.html
+++ b/src/pretix/presale/templates/pretixpresale/event/index.html
@@ -1,7 +1,9 @@
 {% extends "pretixpresale/event/base.html" %}
 {% load i18n %}
+{% load l10n %}
 {% load eventurl %}
 {% load thumbnail %}
+{% load markup_tags %}
 {% block title %}{% trans "Presale" %}{% endblock %}
 
 {% block content %}
@@ -62,7 +64,7 @@
                     {% if tup.0 %}
                         <h3>{{ tup.0.name }}</h3>
                         {% if tup.0.description %}
-                            <p>{{ tup.0.description }}</p>
+                            <p>{{ tup.0.description|localize|apply_markup:"markdown" }}</p>
                         {% endif %}
                     {% endif %}
                     {% for item in tup.1 %}
@@ -81,7 +83,8 @@
                                         <a href="#" data-toggle="variations">
                                             <strong>{{ item.name }}</strong>
                                         </a>
-                                        {% if item.description %}<p>{{ item.description }}</p>{% endif %}
+                                        {% if item.description %}<p>{{ item.description|localize|apply_markup:"markdown" }}</p>
+                                        {% endif %}
                                     </div>
                                     <div class="col-md-2 col-xs-6 price">
                                         {% if item.min_price != item.max_price or item.free_price %}
@@ -154,7 +157,7 @@
                                     {% endif %}
                                     <strong>{{ item.name }}</strong>
                                     {% if item.description %}
-                                        <p class="description">{{ item.description }}</p>{% endif %}
+                                        <p class="description">{{ item.description|localize|apply_markup:"markdown" }}</p>{% endif %}
                                     {% if event.settings.show_quota_left %}
                                         {% include "pretixpresale/event/fragment_quota_left.html" with avail=item.cached_availability %}
                                     {% endif %}
diff --git a/src/pretix/presale/templates/pretixpresale/event/voucher.html b/src/pretix/presale/templates/pretixpresale/event/voucher.html
index a39c4ce8d1..45a39192f0 100644
--- a/src/pretix/presale/templates/pretixpresale/event/voucher.html
+++ b/src/pretix/presale/templates/pretixpresale/event/voucher.html
@@ -1,8 +1,10 @@
 {% extends "pretixpresale/event/base.html" %}
 {% load i18n %}
+{% load l10n %}
 {% load eventurl %}
 {% load eventsignal %}
 {% load thumbnail %}
+{% load markup_tags %}
 {% block title %}{% trans "Voucher redemption" %}{% endblock %}
 
 {% block content %}
@@ -34,7 +36,7 @@
                                             </a>
                                         {% endif %}
                                         <strong>{{ item.name }}</strong>
-                                        {% if item.description %}<p>{{ item.description }}</p>{% endif %}
+                                        {% if item.description %}<p>{{ item.description|localize|apply_markup:"markdown" }}</p>{% endif %}
                                     </div>
                                     <div class="col-md-2 col-xs-6 price">
                                         {% if item.min_price != item.max_price or item.free_price %}
@@ -103,7 +105,7 @@
                                     {% endif %}
                                     <strong>{{ item.name }}</strong>
                                     {% if item.description %}
-                                        <p class="description">{{ item.description }}</p>{% endif %}
+                                        <p class="description">{{ item.description|localize|apply_markup:"markdown" }}</p>{% endif %}
                                 </div>
                                 <div class="col-md-2 col-xs-6 price">
                                     {% if item.free_price %}
diff --git a/src/pretix/settings.py b/src/pretix/settings.py
index dfccc01711..2162c8b752 100644
--- a/src/pretix/settings.py
+++ b/src/pretix/settings.py
@@ -172,7 +172,8 @@ INSTALLED_APPS = [
     'pretix.plugins.reports',
     'pretix.plugins.checkinlists',
     'pretix.plugins.pretixdroid',
-    'easy_thumbnails'
+    'easy_thumbnails',
+    'django_markup',
 ]
 
 for entry_point in iter_entry_points(group='pretix.plugin', name=None):
diff --git a/src/requirements/production.txt b/src/requirements/production.txt
index 5141e9025b..a8518f014f 100644
--- a/src/requirements/production.txt
+++ b/src/requirements/production.txt
@@ -19,3 +19,5 @@ lxml
 static3==0.6.1
 dj-static
 csscompressor
+django-markup
+markdown
diff --git a/src/setup.py b/src/setup.py
index 7c0eaa865a..fe3dd6421f 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -61,7 +61,7 @@ setup(
         'easy-thumbnails>=2.2,<3'
         'PyPDF2', 'BeautifulSoup4', 'html5lib',
         'slimit', 'lxml', 'static3==0.6.1', 'dj-static', 'chardet',
-        'csscompressor', 'defusedxml', 'mt-940'
+        'csscompressor', 'defusedxml', 'mt-940', 'django-markup', 'markdown'
     ],
     extras_require={
         'dev': ['django-debug-toolbar>=1.3.0,<2.0'],