diff --git a/xsl/gemini.xsl b/xsl/gemini.xsl
index 1461e4db6..8bfc12360 100644
--- a/xsl/gemini.xsl
+++ b/xsl/gemini.xsl
@@ -169,18 +169,25 @@
   
   <template match="/page/portal">
     <text>&#10;## Kalender&#10;</text>
-    <call-template name="calendar-events">
-      <with-param name="limit" select="10"/>
-    </call-template>
+    <call-template name="calendar-events"/>
     
     <text>&#10;## Changelog&#10;</text>
     <apply-templates/>
   </template>
 
-  <template name="calendar-events">
-    <param name="limit" select="5"/>
+  <template match="calendar">
+    <text>&#10;## Kalender&#10;</text>
+    <call-template name="calendar-events">
+      <with-param name="limit" select="23"/>
+      <with-param name="src" select="@src"/>
+    </call-template>
+  </template>
 
-    <for-each select="document('../calendar-summary.xml')/page/calendar-summary/event[date:seconds(end) &gt;= date:seconds(date:date())]">
+  <template name="calendar-events">
+    <param name="limit" select="8"/>
+    <param name="src" select="'../calendar-summary.xml'"/>
+
+    <for-each select="document($src)/page/calendar-summary/event[date:seconds(end) &gt;= date:seconds(date:date())]">
       <sort select="date:seconds(start)" data-type="number" order="ascending" />
 
       <if test="position() &lt;= $limit">