diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
new file mode 100644
index 0000000..4f8dbfd
--- /dev/null
+++ b/layouts/shortcodes/figure.html
@@ -0,0 +1,16 @@
+<figure {{ with .Get "class" }}class="{{.}}"{{ end }}>
+{{ with .Get "link" }}<a href="{{.}}">{{ end -}}
+<img src="{{ .Get "src" }}" {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}" {{ end }}{{ with .Get "width" }}width="{{.}}" {{ end }}/>
+{{- if .Get "link" }}</a>{{ end }}
+{{ if or (or (.Get "title") (.Get "caption")) (.Get "attr") -}}
+<figcaption>{{ if isset .Params "title" }}
+<h4>{{ .Get "title" }}</h4>{{ end }}
+{{ if or (.Get "caption") (.Get "attr") -}}
+<p>
+{{- .Get "caption" -}}
+{{ with .Get "attrlink" }} <a href="{{.}}">{{ end }}{{ .Get "attr" }}{{ if .Get "attrlink"}}</a>{{ end -}}
+</p>
+{{ end -}}
+</figcaption>
+{{ end -}}
+</figure>