diff --git a/events.md b/events.md
index 694244f..b2ddb76 100644
--- a/events.md
+++ b/events.md
@@ -1,11 +1,22 @@
---
-title: "Zukünftige Veranstaltungen"
+title: "Veranstaltungen"
layout: default
---
-{% assign events = site.events %}
+{% assign events = site.events | sort: "date", "first" | where_exp:"event","event.date >= site.time" %}
+{% if events.size > 0 %}
+
Zukünftige
{% for event in events %}
-
+
{{ event.excerpt }}
-
{% endfor %}
+{% endif %}
+
+{% assign events = site.events | sort: "date", "last" | where_exp:"event","event.date < site.time" %}
+{% if events.size > 0 %}
+Vergangene
+{% for event in events | sort: "date", "last" | where_exp:"event","event.date < site.time" %}
+
+{{ event.excerpt }}
+{% endfor %}
+{% endif %}