diff --git a/xsl/calendar.xsl b/xsl/calendar.xsl
index 15258ea3f..51410de0b 100644
--- a/xsl/calendar.xsl
+++ b/xsl/calendar.xsl
@@ -133,20 +133,25 @@
 			</xsl:attribute>
 	      </xsl:if>
               <!-- a/@title -->
-				<xsl:if test="string-length(location) &gt; 0">
-					<xsl:attribute name="title">
+				<xsl:attribute name="title">
+					<xsl:if test="string-length(location) &gt; 0">
 						<xsl:value-of select="concat('Ort: ', location)"/>
-						<xsl:if test="string-length(date:time(start)) &gt; 0 or string-length(date:time(end)) &gt; 0">
+					</xsl:if>
+					<xsl:if test="string-length(location) = 0">
+						<xsl:value-of select="concat('Ort: ', 'GCHQ, Lingnerallee 3, 01069 Dresden')"/>
+					</xsl:if>
+					<xsl:if test="string-length(date:time(start)) &gt; 0 or string-length(date:time(end)) &gt; 0">
+						<xsl:if test="date:day-in-month($date) = date:day-in-month(start) or date:day-in-month($date) = date:day-in-month(end)">
 							<xsl:value-of select="concat('&#xA;', 'Zeit:')" disable-output-escaping="yes"/>
-							<xsl:if test="string-length(date:time(start)) &gt; 0 and substring(date:time(start),1,5) != ''">
+							<xsl:if test="date:day-in-month($date) = date:day-in-month(start) and string-length(date:time(start)) &gt; 0 and substring(date:time(start),1,5) != ''">
 								<xsl:value-of select="concat(' ab ', substring(date:time(start),1,5))"/>
 							</xsl:if>
-							<xsl:if test="string-length(date:time(end)) &gt; 0 and substring(date:time(end),1,5) != '' and substring(date:time(end),1,5) !=  substring(date:time(start),1,5)">
+							<xsl:if test="date:day-in-month($date) = date:day-in-month(end) and string-length(date:time(end)) &gt; 0 and substring(date:time(end),1,5) != '' and substring(date:time(end),1,5) !=  substring(date:time(start),1,5)">
 								<xsl:value-of select="concat('&#160;bis&#160;', substring(date:time(end),1,5))"/>
 							</xsl:if>
 						</xsl:if>
-					</xsl:attribute>
-				</xsl:if>
+					</xsl:if>
+				</xsl:attribute>
               <!-- string(a) -->
               <xsl:value-of select="title"/>
             </a>