diff --git a/scripts/generate-stammtisch.rb b/scripts/generate-stammtisch.rb
index df32ef31..520c665a 100755
--- a/scripts/generate-stammtisch.rb
+++ b/scripts/generate-stammtisch.rb
@@ -31,8 +31,13 @@ for month in 1..12
                  else
                    date + (9-date.wday)
                  end
+  firstwednesday = if (date.wday<=3)
+                   date + (3-date.wday)
+                 else
+                   date + (10-date.wday)
+                 end
   result['events'] << event(firsttuesday, 0, 'CCCS-Stammtisch (Zadu-Bar)', 'zadu')
-  result['events'] << event(firsttuesday, 15, 'CCCS-Stammtisch (shackspace)', 'shack')
+  result['events'] << event(firstwednesday, 14, 'CCCS-Stammtisch (shackspace)', 'shack')
 end
 
 puts result.to_yaml