diff --git a/content/_data/stammtisch.yaml b/content/_data/stammtisch.yaml
index 5737fe06..f4b25d15 100644
--- a/content/_data/stammtisch.yaml
+++ b/content/_data/stammtisch.yaml
@@ -1,56 +1,98 @@
 ---
 events:
-  -
-    #kind: event
-    startdate: 2013-08-06T18:00:00
-    duration: 4h
-    #title:
-    location:
-      location: zadu
-    #public: true
-  -
-    startdate: 2013-08-21T18:00:00
-    duration: 4h
-    location:
-      location: shack
-  -
-    startdate: 2013-09-03T18:00:00
-    duration: 4h
-    location:
-      location: zadu
-  -
-    startdate: 2013-09-18T18:00:00
-    duration: 4h
-    location:
-      location: shack
-  -
-    startdate: 2013-10-01T18:00:00
-    duration: 4h
-    location:
-      location: zadu
-  -
-    startdate: 2013-10-16T18:00:00
-    duration: 4h
-    location:
-      location: shack
-  -
-    startdate: 2013-11-05T18:00:00
-    duration: 4h
-    location:
-      location: zadu
-  -
-    startdate: 2013-11-20T18:00:00
-    duration: 4h
-    location:
-      location: shack
-  -
-    startdate: 2013-12-03T18:00:00
-    duration: 4h
-    location:
-      location: zadu
-  -
-    startdate: 2013-12-18T18:00:00
-    duration: 4h
-    location:
-      location: shack
-
+- startdate: 2013-01-01 19:00:00.000000000 +01:00
+  duration: 4h
+  location:
+    location: zadu
+- startdate: 2013-01-16 19:00:00.000000000 +01:00
+  duration: 4h
+  location:
+    location: shack
+- startdate: 2013-02-05 19:00:00.000000000 +01:00
+  duration: 4h
+  location:
+    location: zadu
+- startdate: 2013-02-20 19:00:00.000000000 +01:00
+  duration: 4h
+  location:
+    location: shack
+- startdate: 2013-03-05 19:00:00.000000000 +01:00
+  duration: 4h
+  location:
+    location: zadu
+- startdate: 2013-03-20 19:00:00.000000000 +01:00
+  duration: 4h
+  location:
+    location: shack
+- startdate: 2013-04-02 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: zadu
+- startdate: 2013-04-17 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: shack
+- startdate: 2013-05-07 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: zadu
+- startdate: 2013-05-22 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: shack
+- startdate: 2013-06-04 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: zadu
+- startdate: 2013-06-19 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: shack
+- startdate: 2013-07-02 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: zadu
+- startdate: 2013-07-17 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: shack
+- startdate: 2013-08-06 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: zadu
+- startdate: 2013-08-21 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: shack
+- startdate: 2013-09-03 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: zadu
+- startdate: 2013-09-18 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: shack
+- startdate: 2013-10-01 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: zadu
+- startdate: 2013-10-16 20:00:00.000000000 +02:00
+  duration: 4h
+  location:
+    location: shack
+- startdate: 2013-11-05 19:00:00.000000000 +01:00
+  duration: 4h
+  location:
+    location: zadu
+- startdate: 2013-11-20 19:00:00.000000000 +01:00
+  duration: 4h
+  location:
+    location: shack
+- startdate: 2013-12-03 19:00:00.000000000 +01:00
+  duration: 4h
+  location:
+    location: zadu
+- startdate: 2013-12-18 19:00:00.000000000 +01:00
+  duration: 4h
+  location:
+    location: shack
diff --git a/scripts/generate-stammtisch.rb b/scripts/generate-stammtisch.rb
new file mode 100755
index 00000000..5a6c3dcd
--- /dev/null
+++ b/scripts/generate-stammtisch.rb
@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'date'
+require 'yaml'
+
+year=ARGV[0].to_i
+result = { 'events' => [] }
+
+for month in 1..12
+  date = DateTime.new(year,month,1,18,0,0)
+  firsttuesday = if (date.wday<=2)
+                   date + (2-date.wday)
+                 else
+                   date + (9-date.wday)
+                 end
+  result['events'] << {
+    'startdate' => firsttuesday.to_time,
+    'duration' => '4h',
+    'location' => {
+      'location' => 'zadu'
+    }
+  }
+  result['events'] << {
+    'startdate' => (firsttuesday+15).to_time,
+    'duration' => '4h',
+    'location' => {
+      'location' => 'shack'
+    }
+  }
+end
+
+puts result.to_yaml
+