diff --git a/templates/shortcodes/video.html b/templates/shortcodes/video.html
index 9ce6f5d..afdac38 100644
--- a/templates/shortcodes/video.html
+++ b/templates/shortcodes/video.html
@@ -1,4 +1,9 @@
-{% if title %}<div class="title">{{ title }}</div>{% endif %}
 <video controls><source src="{{ src }}"></video>
-{% if author %}<div class="metadata">{{ author }}</div>{% endif %}
-{% if date %}<div class="metadata">{{ date }}</div>{% endif %}
+{% if title or year and author %}
+<div class="metadata">
+	{% if title %}{{ title }}{% endif %}
+	{% if author and year %}
+		({{ year }}, {{ author }})
+	{% endif %}
+</div>
+{% endif %}