diff --git a/templates/page.html b/templates/page.html
index 8ed6816..e458d64 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -137,6 +137,10 @@ Current section extra: {% if current_section %}{{ current_section.extra | json_e
                 {%- set previous_visible = true -%}
             {% endif %}
 
+            {% if config.extra.hcard and config.extra.hcard.enable and ( not author_list or author_list is containing(config.author)) %}
+                {% include "partials/hcard_small.html" %}
+            {% endif %}
+
             {%- set separator_with_class = "<span class='separator' aria-hidden='true'>" ~ separator ~ "</span>"-%}
 
             {#- Date -#}
diff --git a/templates/partials/hcard.html b/templates/partials/hcard.html
index 91c023b..6479da6 100644
--- a/templates/partials/hcard.html
+++ b/templates/partials/hcard.html
@@ -16,7 +16,7 @@
     {%- if hcard.avatar -%}
     <img
       class="u-photo"
-      src="{{ get_url(path=hcard.avatar) }}"
+      src="{{ get_url(path=hcard.avatar, cachebust=true) }}"
       width="200"
       height="200"
       alt="{{ full_name }}"
diff --git a/templates/partials/hcard_small.html b/templates/partials/hcard_small.html
new file mode 100644
index 0000000..f30add5
--- /dev/null
+++ b/templates/partials/hcard_small.html
@@ -0,0 +1,26 @@
+{%- set hcard = config.extra.hcard -%}
+
+{%- set full_name = config.author -%}
+{%- if hcard.full_name -%}
+  {%- set full_name = hcard.full_name -%}
+{%- endif -%}
+
+{%- set homepage = config.base_url -%}
+{%- if hcard.homepage -%}
+  {%- set homepage = hcard.homepage -%}
+{%- endif -%}
+
+{%- set icon_attr = "" -%}
+{%- if hcard.avatar -%}
+    {%- set icon_attr = "author-icon" -%}
+{%- endif -%}
+
+<span class="hidden p-author h-card">
+<a rel="author" href="{{ homepage }}" class="u-url {{ icon_attr }}" title="{{ full_name }}">
+    {%- if hcard.avatar -%}
+    <img class="u-photo" src="{{ get_url(path=hcard.avatar, cachebust=true) }}" alt="{{ full_name }}" />
+    {%- else -%}
+    {{ full_name }}
+    {%- endif -%}
+</a>
+</span>