diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/base.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/base.xsl
index 927d7c6e20b..c010ee67a55 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/base.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/base.xsl
@@ -7,6 +7,7 @@
                 xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0"
                 xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
                 xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0"
+                xmlns:lan="http://standards.iso.org/iso/19115/-3/lan/1.0"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xlink="http://www.w3.org/1999/xlink"
                 xmlns:gn-fn-iso19115-3.2018="http://geonetwork-opensource.org/xsl/functions/profiles/iso19115-3.2018"
@@ -92,6 +93,10 @@
                                     ('publication', 'revision')]/
                                     cit:date/gco:*[. != '']"/>
 
+
+    <xsl:variable name="datasetLanguage"
+                  select="$metadata/mdb:identificationInfo/*/mri:defaultLocale/*/lan:language/*/@codeListValue"/>
+
     <xsl:variable name="publicationDates" as="node()*">
       <xsl:perform-sort select="$dates">
         <xsl:sort select="." order="descending"/>
@@ -163,6 +168,7 @@
       <doiUrl><xsl:value-of select="$doiUrl"/></doiUrl>
       <xsl:copy-of select="$translatedKeywords"/>
       <additionalCitation><xsl:value-of select="$additionalCitation"/></additionalCitation>
+      <language><xsl:value-of select="datasetLanguage"  /></language>
     </citation>
 
   </xsl:template>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/common.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/common.xsl
index 233690c2176..76252b77875 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/common.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/common.xsl
@@ -71,7 +71,7 @@
 
   <xsl:template mode="citation" match="citation[lower-case($format) = 'bibtex']">
     <!-- https://en.wikipedia.org/wiki/BibTeX -->
-    <textResponse>@data{<xsl:value-of select="uuid"/>,
+    <textResponse>@misc{<xsl:value-of select="uuid"/>,
       author = {<xsl:value-of select="normalize-space(string-join(authorsNameAndOrgList/*, ', '))"/>},
       publisher = {<xsl:value-of select="normalize-space(string-join(publishersNameAndOrgList/*, ', '))"/>},
       title = {<xsl:value-of select="normalize-space(translatedTitle)"/>},
@@ -91,7 +91,10 @@
         <xsl:text>AU  - </xsl:text><xsl:value-of select="normalize-space(.)"/><xsl:text>&#13;&#10;</xsl:text>
       </xsl:for-each>
       <xsl:text>TI  - </xsl:text><xsl:value-of select="normalize-space(translatedTitle)"/><xsl:text>&#13;&#10;</xsl:text>
-      <!-- TODO: LA, ET -->
+      <!-- TODO: ET -->
+      <xsl:if test="language != ''">
+        <xsl:text>LA  - </xsl:text><xsl:value-of select="language"/><xsl:text>&#13;&#10;</xsl:text>
+      </xsl:if>
       <xsl:for-each select="publishersNameAndOrgList/*[. != '']">
         <xsl:text>PB  - </xsl:text><xsl:value-of select="normalize-space(.)"/><xsl:text>&#13;&#10;</xsl:text>
       </xsl:for-each>
@@ -103,6 +106,10 @@
         <xsl:text>DO  - </xsl:text><xsl:value-of select="doi"/><xsl:text>&#13;&#10;</xsl:text>
       </xsl:if>
       <xsl:text>ID  - </xsl:text><xsl:value-of select="uuid"/><xsl:text>&#13;&#10;</xsl:text>
+      <xsl:if test="lastPublicationDate != ''">
+        <xsl:text>DA  - </xsl:text><xsl:value-of select="concat(replace(substring(lastPublicationDate, 1, 12), '-', '/'), '/')" /><xsl:text>&#13;&#10;</xsl:text>
+        <xsl:text>PY  - </xsl:text><xsl:value-of select="substring(lastPublicationDate, 1, 4)" /><xsl:text>&#13;&#10;</xsl:text>
+      </xsl:if>
       <xsl:text>ER  -</xsl:text>
     </textResponse>
   </xsl:template>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/formatter/citation/base.xsl b/schemas/iso19139/src/main/plugin/iso19139/formatter/citation/base.xsl
index 9901fc1028e..9d6e63955fa 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/formatter/citation/base.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/formatter/citation/base.xsl
@@ -62,6 +62,9 @@
     <xsl:variable name="langId"
                   select="gn-fn-iso19139:getLangId($metadata, $language)"/>
 
+    <xsl:variable name="datasetLanguage"
+                  select="$metadata/gmd:identificationInfo/*/gmd:language/*/@codeListValue"/>
+
     <xsl:variable name="authors"
                   select="$metadata/gmd:identificationInfo/*/gmd:pointOfContact/
                                 *[gmd:role/*/@codeListValue = $authorRolesList]"/>
@@ -167,6 +170,7 @@
       <doiUrl><xsl:value-of select="$doiUrl"/></doiUrl>
       <xsl:copy-of select="$translatedKeywords"/>
       <additionalCitation><xsl:value-of select="$additionalCitation"/></additionalCitation>
+      <language><xsl:value-of select="datasetLanguage"  /></language>
     </citation>
   </xsl:template>
 </xsl:stylesheet>