diff --git a/feed.xml b/feed.xml
index 022378bebd62bd0062a6fac48919354352dadf65..b1081f275e4f318ec53afce3206a3fe339c3b36a 100644
--- a/feed.xml
+++ b/feed.xml
@@ -3,28 +3,39 @@ layout: null
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-  <channel>
-    <title>{{ site.title | xml_escape }}</title>
-    <description>{{ site.description | xml_escape }}</description>
-    <link>{{ site.url }}{{ site.baseurl }}/</link>
-    <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml" />
-    <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
-    <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
-    <generator>Jekyll v{{ jekyll.version }}</generator>
-    {% for post in site.posts limit:10 %}
-      <item>
-        <title>{{ post.title | xml_escape }}</title>
-        <description>{{ post.content | xml_escape }}</description>
-        <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
-        <link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
-        <guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
-        {% for tag in post.tags %}
-        <category>{{ tag | xml_escape }}</category>
-        {% endfor %}
-        {% for cat in post.categories %}
-        <category>{{ cat | xml_escape }}</category>
-        {% endfor %}
-      </item>
-    {% endfor %}
-  </channel>
+	<channel>
+		<title>{{ site.title | xml_escape }}</title>
+		<description>{{ site.description | xml_escape }}</description>
+		<link>{{ site.url }}{{ site.baseurl }}/</link>
+		<atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml" />
+		<pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
+		<lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
+		<generator>Jekyll v{{ jekyll.version }}</generator>
+		{% for post in site.posts limit:10 %}
+		<item>
+			<title>{% if post.categories contains 'event' %}Termin: {% endif %}{{ post.title | xml_escape }}</title>
+			<description>{% if post.categories contains 'event' %}
+			{% capture eventstuff %}
+			<p>
+				Anfang: {{ post.eventstart | date: "%d.%m.%Y %H:%M" }}<br />
+				Ende: {{ post.eventend | date: "%d.%m.%Y %H:%M" }}<br />
+				Ort: {% if post.location %}{{ post.location }}{% else %}Free Software Lab{% endif %}
+				{% if post.organizer %}<br />Organisation: {{ post.organizer }}{% endif %}
+			</p>
+			{% endcapture %}
+			{{ eventstuff | xml_escape }}
+			{% endif %}
+			{{ post.content | xml_escape }}</description>
+			<pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
+			<link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
+			<guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
+			{% for tag in post.tags %}
+			<category>{{ tag | xml_escape }}</category>
+			{% endfor %}
+			{% for cat in post.categories %}
+			<category>{{ cat | xml_escape }}</category>
+			{% endfor %}
+		</item>
+		{% endfor %}
+	</channel>
 </rss>