diff --git a/xsl/calendar.xsl b/xsl/calendar.xsl
index 1828584d9..0456aa685 100644
--- a/xsl/calendar.xsl
+++ b/xsl/calendar.xsl
@@ -132,10 +132,13 @@
 				<xsl:if test="string-length(location) &gt; 0">
 					<xsl:attribute name="title">
 						<xsl:value-of select="concat('Ort: ', location)"/>
-						<xsl:if test="string-length(start) &gt; 0">
-							<xsl:value-of select="concat(' &#xA;Zeit: ', substring(date:time(start),0,6))"/>
-							<xsl:if test="date:seconds(start) != date:seconds(end)">
-								<xsl:value-of select="concat('&#160;-&#160;', substring(date:time(end),0,6))"/>
+						<xsl:if test="string-length(date:time(start)) &gt; 0 or string-length(date:time(end)) &gt; 0">
+							<xsl:value-of select="concat('&#xA;', 'Zeit:')" disable-output-escaping="yes"/>
+							<xsl:if test="string-length(date:time(start)) &gt; 0">
+								<xsl:value-of select="concat(' von ', substring(date:time(start),0,6))"/>
+							</xsl:if>
+							<xsl:if test="string-length(date:time(end)) &gt; 0">
+								<xsl:value-of select="concat('&#160;bis&#160;', substring(date:time(end),0,6))"/>
 							</xsl:if>
 						</xsl:if>
 					</xsl:attribute>