diff --git a/_includes/layouts/post.njk b/_includes/layouts/post.njk
index 6840566..0623230 100644
--- a/_includes/layouts/post.njk
+++ b/_includes/layouts/post.njk
@@ -5,13 +5,15 @@ layout: layouts/base.njk
 {%- css %}{% include "public/css/code.css" %}{% endcss %}
 <h1>{{ title }}</h1>
 
-<ul class="post-metadata">
-	<li><time datetime="{{ page.date | htmlDateString }}">{{ page.date | readableDate }}</time></li>
-	{%- for tag in tags | filterTagList %}
-	{%- set tagUrl %}/tags/{{ tag | slugify }}/{% endset %}
-	<li><a href="{{ tagUrl }}" class="post-tag">{{ tag }}</a></li>
-	{%- endfor %}
-</ul>
+<div class="post-metadata">
+	<p>{% if author.name %}{{ author.name }}, {% else %}{{ metadata.author.name }}, {% endif %}<time datetime="{{ page.date | htmlDateString }}">{{ page.date | readableDate }}</time></p>
+	<ul>
+		{%- for tag in tags | filterTagList %}
+		{%- set tagUrl %}/tags/{{ tag | slugify }}/{% endset %}
+		<li><a href="{{ tagUrl }}" class="post-tag">{{ tag }}</a></li>
+		{%- endfor %}
+	</ul>
+</div>
 
 {{ content | safe }}