diff --git a/layouts/shortcodes/spoiler.gmi b/layouts/shortcodes/spoiler.gmi
new file mode 100644
index 00000000..4ad0ce88
--- /dev/null
+++ b/layouts/shortcodes/spoiler.gmi
@@ -0,0 +1,7 @@
+⚠️ The next paragraph(s) contain spoilers!
+
+{{ .Inner | markdownify }}
+
+🛟 Spoilers over!
+
+{{ .Page.Store.Set "hasSpoilers" true -}}
\ No newline at end of file