diff --git a/assets/css/bobastyle.css b/assets/css/bobastyle.css
index 1a4e473..1ee68e5 100644
--- a/assets/css/bobastyle.css
+++ b/assets/css/bobastyle.css
@@ -106,6 +106,12 @@ img:not(.noborder), video:not(.noborder) {
   border: 5px solid #1b5b9b;
 }
 
+figcaption {
+  font-style: italic;
+  font-size: small;
+  text-align: center;
+}
+
 a {
   color: #4da6ff;
   text-decoration: inherit;
diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
new file mode 100644
index 0000000..fc510af
--- /dev/null
+++ b/layouts/shortcodes/figure.html
@@ -0,0 +1,24 @@
+<figure>
+
+    {{ if .Get "href" }}<a href="{{ .Get "href" }}">{{ end }}
+        <img src="{{ .Get "src" }}"
+             {{ if or (.Get "alt") (.Get "caption") }}
+             alt="{{ with .Get "alt" }}
+                  {{ . }}
+                  {{ else }}
+                  {{ .Get "caption" | markdownify }}
+                  {{ end }}"
+             {{ end }}
+
+             {{ with .Get "width" }} width="{{ . }}" {{ end }}
+             {{ with .Get "height" }} height="{{ . }}" {{ end }}
+        />
+    {{ if .Get "href" }}</a>{{ end }}
+
+    {{ with .Get "caption" }}
+    <figcaption>
+        {{ . | markdownify }}
+    </figcaption>
+    {{ end }}
+
+</figure>