diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
index e36c0fee..657c0e8d 100644
--- a/symposion/schedule/models.py
+++ b/symposion/schedule/models.py
@@ -48,6 +48,7 @@ class Slot(models.Model):
     kind = models.ForeignKey(SlotKind)
     start = models.TimeField()
     end = models.TimeField()
+    content_override = models.TextField(blank=True)
     
     def assign(self, content):
         """
diff --git a/symposion/templates/schedule/_edit_grid.html b/symposion/templates/schedule/_edit_grid.html
index cb4ffe1a..ecb66757 100644
--- a/symposion/templates/schedule/_edit_grid.html
+++ b/symposion/templates/schedule/_edit_grid.html
@@ -18,7 +18,11 @@
                             <div class="speaker">{{ slot.content.speaker }}</div>
                         {% endif %}
                     {% else %}
-                        {{ slot.kind.label }}
+                        {% if slot.content_override %}
+                            {{ slot.content_override|safe }}
+                        {% else %}
+                            {{ slot.kind.label }}
+                        {% endif %}
                     {% endif %}
                 </td>
             {% endfor %}
diff --git a/symposion/templates/schedule/_grid.html b/symposion/templates/schedule/_grid.html
index 84c261e1..7b425ad1 100644
--- a/symposion/templates/schedule/_grid.html
+++ b/symposion/templates/schedule/_grid.html
@@ -17,7 +17,11 @@
                             <div class="speaker">{{ slot.content.speaker }}</div>
                         {% endif %}
                     {% else %}
-                        {{ slot.kind.label }}
+                        {% if slot.content_override %}
+                            {{ slot.content_override|safe }}
+                        {% else %}
+                            {{ slot.kind.label }}
+                        {% endif %}
                     {% endif %}
                 </td>
             {% endfor %}