diff --git a/src/submission/models.py b/src/submission/models.py
index b845b5d71d..53b37ea645 100755
--- a/src/submission/models.py
+++ b/src/submission/models.py
@@ -1399,6 +1399,11 @@ def author_list(self):
         else:
             return ", ".join([author.full_name() for author in self.authors.all()])
 
+    def bibtex_author_list(self):
+        return " AND ".join(
+            [author.full_name() for author in self.frozen_authors()],
+        )
+
     def keyword_list_str(self, separator=","):
         if self.keywords.exists():
             return separator.join(kw.word for kw in self.keywords.all())
diff --git a/src/templates/common/encoding/article_bibtex.bib b/src/templates/common/encoding/article_bibtex.bib
index 01c1abb858..a3a4b0e5bc 100644
--- a/src/templates/common/encoding/article_bibtex.bib
+++ b/src/templates/common/encoding/article_bibtex.bib
@@ -1,7 +1,7 @@
 {% load settings %}
 {% load encoding %}
-{% if article.journal.is_conference %}@conference{% else %}@article{% endif %}{% templatetag openbrace %}{{ article.journal.code }} {{ article.id }},
-	author = {{ article.author_list|latex_conform }},
+{% if article.journal.is_conference %}@conference{% else %}@article{% endif %}{% templatetag openbrace %}{{ article.journal.code }}{{ article.id }},
+	author = {{ article.bibtex_author_list|latex_conform }},
 	title = {{ article.title|escape|latex_conform }},
 	volume = {{ article.issue.volume|latex_conform }},
 	year = {{ article.date_published.year|latex_conform }},
@@ -13,6 +13,6 @@ @conference{
 	{% if article.page_range %}pages = {{ article.page_range|latex_conform }},{% endif %}
 	{% if article.keywords.exists %}keywords = {{ article.keyword_list_str|escape|latex_conform }},{% endif %}
 	{% if article.journal_issn %}issn = {{ article.journal_issn|latex_conform }},{% endif %}
-	publisher={{ article.journal|setting:'publisher_name'|latex_conform }},
+	publisher ={{ article.journal|setting:'publisher_name'|latex_conform }},
 	journal = {{article.journal_title|latex_conform }}
 }
diff --git a/src/templates/common/encoding/article_ris.ris b/src/templates/common/encoding/article_ris.ris
index e0b1086166..1794d9cf8b 100644
--- a/src/templates/common/encoding/article_ris.ris
+++ b/src/templates/common/encoding/article_ris.ris
@@ -1,13 +1,17 @@
 {% load settings %}TY  - {% if article.journal.is_conference %}CONF{% else %}JOUR{% endif %}
-AB  - {{ article.abstract|escape}}
-AU  - {{ article.author_list }}
-DA  - {{ article.date_published.year }}/{{article.date_published.month}}//
-{% if article.get_doi %}DO - {{ article.get_doi }}{% endif %}
+AB  - {{ article.abstract|escape}}{% for author in article.frozen_authors.all %}
+AU  - {{ author.full_name }}{% endfor %}
+PA  - {{ article.date_published.year }}
+DA  - {{ article.date_published|date:"Y/m/d" }}
+{% if article.get_doi %}DO  - {{ article.get_doi }}{% endif %}
 IS  - {{ article.issue.issue }}
 VL  - {{ article.issue.volume }}
 PB  - {{ article.journal|setting:'publisher_name' }}
 PY  - {{ article.date_published.year }}
 TI  - {{ article.title|escape}}
 T2  - {{ article.journal_title }}
-UR  - {{ article.url }}
-ER  -
+UR  - {{ article.url }}{% for keyword in article.keywords.all %}
+KW  - {{ keyword.word }}{% endfor %}
+{% if article.first_page %}SP  - {{ article.first_page }}{% endif %}
+{% if article.last_page %}EP  - {{ article.last_page }}{% endif %}
+ER  -
\ No newline at end of file