diff --git a/xslt/divelogs-export.xslt b/xslt/divelogs-export.xslt
index 80abadb37..fcdfb549a 100644
--- a/xslt/divelogs-export.xslt
+++ b/xslt/divelogs-export.xslt
@@ -23,6 +23,11 @@
     <TIME>
       <xsl:value-of select="@time"/>
     </TIME>
+    <xsl:if test="divecomputer/@model != ''">
+      <COMPUTERMODEL>
+        <xsl:value-of select="divecomputer/@model"/>
+      </COMPUTERMODEL>
+    </xsl:if>
 
     <xsl:variable name="duration">
       <xsl:call-template name="time2sec">
@@ -385,6 +390,11 @@
                     <DEPTH>
                       <xsl:value-of select="substring-before(./@depth, ' ')"/>
                     </DEPTH>
+		    <xsl:if test="./@temp != ''">
+                      <TEMP>
+                        <xsl:value-of select="substring-before(./@temp, ' ')"/>
+                      </TEMP>
+                    </xsl:if>
                   </SAMPLE>
                 </xsl:when>
               </xsl:choose>
@@ -394,6 +404,11 @@
                 <DEPTH>
                   <xsl:value-of select="substring-before(./@depth, ' ')"/>
                 </DEPTH>
+		<xsl:if test="./@temp != ''">
+                  <TEMP>
+                    <xsl:value-of select="substring-before(./@temp, ' ')"/>
+                  </TEMP>
+                </xsl:if>
               </SAMPLE>
             </xsl:otherwise>
           </xsl:choose>
diff --git a/xslt/divelogs.xslt b/xslt/divelogs.xslt
index 2568824ea..5fb05034c 100644
--- a/xslt/divelogs.xslt
+++ b/xslt/divelogs.xslt
@@ -162,6 +162,11 @@
           <xsl:attribute name="depth">
             <xsl:value-of select="concat(., ' m')"/>
           </xsl:attribute>
+	  <xsl:if test="../TEMP != ''">
+            <xsl:attribute name="temp">
+              <xsl:value-of select="../TEMP"/>
+            </xsl:attribute>
+          </xsl:if>
         </sample>
       </xsl:for-each>