diff --git a/xslt/MacDive.xslt b/xslt/MacDive.xslt
index 3e2c462f4..e9a007a64 100644
--- a/xslt/MacDive.xslt
+++ b/xslt/MacDive.xslt
@@ -67,7 +67,16 @@
       </xsl:attribute>
 
       <xsl:attribute name="tags">
-        <xsl:value-of select="entryType"/>
+        <xsl:for-each select="tags/tag|entryType">
+          <xsl:choose>
+            <xsl:when test="position() = 1">
+              <xsl:value-of select="."/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="concat(',', .)"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:for-each>
       </xsl:attribute>
 
       <xsl:variable name="delta">