diff --git a/src/pretix/base/migrations/0020_auto_20160421_1943.py b/src/pretix/base/migrations/0020_auto_20160421_1943.py
new file mode 100644
index 0000000000..c2390dc58d
--- /dev/null
+++ b/src/pretix/base/migrations/0020_auto_20160421_1943.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-04-21 19:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import pretix.base.i18n
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0019_auto_20160326_1139'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='itemcategory',
+            name='description',
+            field=pretix.base.i18n.I18nTextField(blank=True, verbose_name='Category description'),
+        ),
+        migrations.AlterField(
+            model_name='questionanswer',
+            name='options',
+            field=models.ManyToManyField(blank=True, related_name='answers', to='pretixbase.QuestionOption'),
+        ),
+    ]
diff --git a/src/pretix/base/models/items.py b/src/pretix/base/models/items.py
index 6520a18e86..3e239eb61a 100644
--- a/src/pretix/base/models/items.py
+++ b/src/pretix/base/models/items.py
@@ -36,6 +36,9 @@ class ItemCategory(LoggedModel):
         max_length=255,
         verbose_name=_("Category name"),
     )
+    description = I18nTextField(
+        blank=True, verbose_name=_("Category description")
+    )
     position = models.IntegerField(
         default=0
     )
diff --git a/src/pretix/control/forms/item.py b/src/pretix/control/forms/item.py
index ab7a4084fb..76b1d25472 100644
--- a/src/pretix/control/forms/item.py
+++ b/src/pretix/control/forms/item.py
@@ -16,7 +16,8 @@ class CategoryForm(I18nModelForm):
         model = ItemCategory
         localized_fields = '__all__'
         fields = [
-            'name'
+            'name',
+            'description'
         ]
 
 
diff --git a/src/pretix/control/templates/pretixcontrol/items/category.html b/src/pretix/control/templates/pretixcontrol/items/category.html
index 8e1b87e10b..d3774ac19e 100644
--- a/src/pretix/control/templates/pretixcontrol/items/category.html
+++ b/src/pretix/control/templates/pretixcontrol/items/category.html
@@ -10,6 +10,7 @@
 		<fieldset>
 			<legend>{% trans "General information" %}</legend>
 			{% bootstrap_field form.name layout="horizontal" %}
+			{% bootstrap_field form.description layout="horizontal" %}
 		</fieldset>
 		<div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html
index 875b430623..9d903873bb 100644
--- a/src/pretix/presale/templates/pretixpresale/event/index.html
+++ b/src/pretix/presale/templates/pretixpresale/event/index.html
@@ -56,7 +56,12 @@
             {% csrf_token %}
             {% for tup in items_by_category %}
                 <section>
-                    {% if tup.0 %}<h3>{{ tup.0.name }}</h3>{% endif %}
+                    {% if tup.0 %}
+                        <h3>{{ tup.0.name }}</h3>
+                        {% if tup.0.description %}
+                            <p>{{ tup.0.description }}</p>
+                        {% endif %}
+                    {% endif %}
                     {% for item in tup.1 %}
                         {% if item.has_variations %}
                             <div class="item-with-variations">