diff --git a/content/_data/stammtisch.yaml b/content/_data/stammtisch.yaml
index 414e9cbb..89489512 100644
--- a/content/_data/stammtisch.yaml
+++ b/content/_data/stammtisch.yaml
@@ -1,98 +1,122 @@
 ---
 events:
-- startdate: 2013-01-01 18:00:00.000000000 +01:00
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2013-01-01 18:00:00.000000000 +01:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-01-16 18:00:00.000000000 +01:00
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2013-01-16 18:00:00.000000000 +01:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-02-05 18:00:00.000000000 +01:00
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2013-02-05 18:00:00.000000000 +01:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-02-20 18:00:00.000000000 +01:00
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2013-02-20 18:00:00.000000000 +01:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-03-05 18:00:00.000000000 +01:00
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2013-03-05 18:00:00.000000000 +01:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-03-20 18:00:00.000000000 +01:00
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2013-03-20 18:00:00.000000000 +01:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-04-02 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2013-04-02 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-04-17 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2013-04-17 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-05-07 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2013-05-07 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-05-22 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2013-05-22 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-06-04 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2013-06-04 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-06-19 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2013-06-19 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-07-02 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2013-07-02 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-07-17 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2013-07-17 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-08-06 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2013-08-06 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-08-21 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2013-08-21 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-09-03 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2013-09-03 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-09-18 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2013-09-18 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-10-01 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2013-10-01 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-10-16 18:00:00.000000000 +02:00
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2013-10-16 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-11-05 18:00:00.000000000 +01:00
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2013-11-05 18:00:00.000000000 +01:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-11-20 18:00:00.000000000 +01:00
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2013-11-20 18:00:00.000000000 +01:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-12-03 18:00:00.000000000 +01:00
+- title: CCCS-Stammtisch (Zadu-Bar)
+  startdate: 2013-12-03 18:00:00.000000000 +01:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-12-18 18:00:00.000000000 +01:00
+- title: CCCS-Stammtisch (shackspace)
+  startdate: 2013-12-18 18:00:00.000000000 +01:00
   duration: 4h
   location:
     location: shack
diff --git a/scripts/generate-stammtisch.rb b/scripts/generate-stammtisch.rb
index a09e05ac..75686b7c 100755
--- a/scripts/generate-stammtisch.rb
+++ b/scripts/generate-stammtisch.rb
@@ -5,9 +5,10 @@ require 'date'
 require 'yaml'
 
 
-def event(day, dayoffset, location)
+def event(day, dayoffset, title, location)
   startDate = Time.local(day.year, day.month, day.day + dayoffset, 18, 0, 0)
   {
+    'title' => title,
     'startdate' => startDate,
     'duration' => '4h',
     'location' => {
@@ -27,8 +28,8 @@ for month in 1..12
                  else
                    date + (9-date.wday)
                  end
-  result['events'] << event(firsttuesday, 0, 'zadu')
-  result['events'] << event(firsttuesday, 15, 'shack')
+  result['events'] << event(firsttuesday, 0, 'CCCS-Stammtisch (Zadu-Bar)', 'zadu')
+  result['events'] << event(firsttuesday, 15, 'CCCS-Stammtisch (shackspace)', 'shack')
 end
 
 puts result.to_yaml