diff --git a/templates/archives.html b/templates/archives.html
index a7374d7b606279082bb8f1c4fd52019a52be79e1..13b4d4b1b4a7505ed5dbb53507c94b2824abb0e1 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -8,11 +8,15 @@
             <h2>Archives for {{ SITENAME }}</h2>
             <ul>
                 {% for article in dates %}
-                    <li><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a>
+                <li><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}
+      {% if article.author %}
+      -- {{ article.author }}
+      {% endif %}
+		  </a>
                         <time>{{ article.date|strftime('%b %Y') }}</time>
                     </li>
                 {% endfor %}
             </ul>
         </section>
     </main>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/article.html b/templates/article.html
index eaf9762a3c514373bba1d47dfa0c9d4f3d5d2b1e..5f792bda159ce09e81ad87d73fe64ac75030109c 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -13,7 +13,10 @@
 {% block content %}
 <main>
     <article>
-        <h1>{{ article.title }}</h1>
+      <h1>{{ article.title }}</h1>
+      {% if article.author %}
+      <h2>{{ article.author }}</h2>
+      {% endif %}
         {% import 'translations.html' as translations with context %}
         {{ translations.translations_for(article) }}
         <aside>
diff --git a/templates/category.html b/templates/category.html
index 12c566c8a988d5fc3955bd898d1f7674f473490e..2082ab2aa2a29229e504db43da6f64bd9311bdad 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -13,7 +13,12 @@
                     {% if period != new.p %}
                         <h3>{{ period }}</h3>
                         <li>
-                            <a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a>
+                          <a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}
+      {% if article.author %}
+      -- {{ article.author }}
+      {% endif %}
+
+			  </a>
                             <time>{{ article.date|strftime('%b %Y') }}</time>
                         </li>
                         {% set new.p = article.date | strftime('%Y') %}
diff --git a/templates/index.html b/templates/index.html
index 30690b3034dd70055e5cb1329d4f35120dce1ec6..20c19ad0e85bcd0531887a214939a98ce5c5e278 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -6,8 +6,12 @@
             <ul>
                 {% for article in articles_page.object_list %}
                     <li>
-                        <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-                               title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
+                        <h2><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
+                               title="Permalink to {{ article.title|striptags }}">{{ article.title }}
+      {% if article.author %}
+       -- {{ article.author }}
+      {% endif %}
+			</a></h2>
                         <aside>
                             <ul>
                                 <li>