diff --git a/content/_data/stammtisch.yaml b/content/_data/stammtisch.yaml
index f4b25d15..8247e799 100644
--- a/content/_data/stammtisch.yaml
+++ b/content/_data/stammtisch.yaml
@@ -1,98 +1,98 @@
 ---
 events:
-- startdate: 2013-01-01 19:00:00.000000000 +01:00
+- startdate: 2013-01-01 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-01-16 19:00:00.000000000 +01:00
+- startdate: 2013-01-16 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-02-05 19:00:00.000000000 +01:00
+- startdate: 2013-02-05 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-02-20 19:00:00.000000000 +01:00
+- startdate: 2013-02-20 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-03-05 19:00:00.000000000 +01:00
+- startdate: 2013-03-05 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-03-20 19:00:00.000000000 +01:00
+- startdate: 2013-03-20 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-04-02 20:00:00.000000000 +02:00
+- startdate: 2013-04-02 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-04-17 20:00:00.000000000 +02:00
+- startdate: 2013-04-17 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-05-07 20:00:00.000000000 +02:00
+- startdate: 2013-05-07 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-05-22 20:00:00.000000000 +02:00
+- startdate: 2013-05-22 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-06-04 20:00:00.000000000 +02:00
+- startdate: 2013-06-04 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-06-19 20:00:00.000000000 +02:00
+- startdate: 2013-06-19 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-07-02 20:00:00.000000000 +02:00
+- startdate: 2013-07-02 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-07-17 20:00:00.000000000 +02:00
+- startdate: 2013-07-17 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-08-06 20:00:00.000000000 +02:00
+- startdate: 2013-08-06 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-08-21 20:00:00.000000000 +02:00
+- startdate: 2013-08-21 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-09-03 20:00:00.000000000 +02:00
+- startdate: 2013-09-03 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-09-18 20:00:00.000000000 +02:00
+- startdate: 2013-09-18 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-10-01 20:00:00.000000000 +02:00
+- startdate: 2013-10-01 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-10-16 20:00:00.000000000 +02:00
+- startdate: 2013-10-16 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-11-05 19:00:00.000000000 +01:00
+- startdate: 2013-11-05 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-11-20 19:00:00.000000000 +01:00
+- startdate: 2013-11-20 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
-- startdate: 2013-12-03 19:00:00.000000000 +01:00
+- startdate: 2013-12-03 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: zadu
-- startdate: 2013-12-18 19:00:00.000000000 +01:00
+- startdate: 2013-12-18 18:00:00.000000000 +02:00
   duration: 4h
   location:
     location: shack
diff --git a/scripts/generate-stammtisch.rb b/scripts/generate-stammtisch.rb
index 5a6c3dcd..b76af2ce 100755
--- a/scripts/generate-stammtisch.rb
+++ b/scripts/generate-stammtisch.rb
@@ -4,30 +4,31 @@
 require 'date'
 require 'yaml'
 
+
+def event(day, dayoffset, location)
+  startDate = Time.new(day.year, day.month, day.day + dayoffset, 18, 0, 0, "+02:00")
+  {
+    'startdate' => startDate,
+    'duration' => '4h',
+    'location' => {
+      'location' => location
+    }
+  }
+end
+
+
 year=ARGV[0].to_i
 result = { 'events' => [] }
 
 for month in 1..12
-  date = DateTime.new(year,month,1,18,0,0)
+  date = Date.new(year,month,1)
   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'
-    }
-  }
+  result['events'] << event(firsttuesday, 0, 'zadu')
+  result['events'] << event(firsttuesday, 15, 'shack')
 end
 
 puts result.to_yaml