diff --git a/xsl/calendar-summary.xsl b/xsl/calendar-summary.xsl
index b1a1fbcbc..71ada9c6e 100644
--- a/xsl/calendar-summary.xsl
+++ b/xsl/calendar-summary.xsl
@@ -37,7 +37,7 @@
         </xsl:choose>
       </title>
       <date><xsl:value-of select="start"/></date>
-      <location><xsl:value-of select="start"/></location>
+      <location><xsl:value-of select="location"/></location>
       <!-- TODO: Link -->
     </event>
   </xsl:template>
diff --git a/xsl/calendar.xsl b/xsl/calendar.xsl
index d361f9c7a..0a2e85010 100644
--- a/xsl/calendar.xsl
+++ b/xsl/calendar.xsl
@@ -70,6 +70,14 @@
       </xsl:choose>
     </xsl:attribute>
     <xsl:value-of select="date:day-in-month($date)"/>
+    <ul>
+      <xsl:for-each select="event">
+        <xsl:sort select="date"/>
+        <xsl:if test="concat(date:year($date),'-',date:month-in-year($date),'-',date:day-in-month($date)) = concat(date:year(date),'-',date:month-in-year(date),'-',date:day-in-month(date))">
+          <li><xsl:value-of select="title"/></li>
+        </xsl:if>
+      </xsl:for-each>
+    </ul>
   </td>
   <xsl:if test="date:day-in-week($date) != 1">  <!-- Sunday? Break and return to output-week... -->
     <xsl:call-template name="output-day">