diff --git a/pkg/mark/stdlib/stdlib.go b/pkg/mark/stdlib/stdlib.go
index cc4c57d1..f39d61c6 100644
--- a/pkg/mark/stdlib/stdlib.go
+++ b/pkg/mark/stdlib/stdlib.go
@@ -109,8 +109,9 @@ func templates(api *confluence.API) (*template.Template, error) {
 			`{{ if .Title }}<ac:parameter ac:name="title">{{ .Title }}</ac:parameter>{{printf "\n"}}{{ end }}`,
 			`<ac:rich-text-body>{{printf "\n"}}{{ end }}`,
 
-			`<ac:structured-macro ac:name="code">{{printf "\n"}}`,
-			/**/ `<ac:parameter ac:name="language">{{ .Language }}</ac:parameter>{{printf "\n"}}`,
+			`<ac:structured-macro ac:name="{{ if eq .Language "mermaid" }}cloudscript-confluence-mermaid{{ else }}code{{ end }}">{{printf "\n"}}`,
+			/**/ `{{ if eq .Language "mermaid" }}<ac:parameter ac:name="showSource">true</ac:parameter>{{printf "\n"}}{{ else }}`,
+			/**/ `<ac:parameter ac:name="language">{{ .Language }}</ac:parameter>{{printf "\n"}}{{ end }}`,
 			/**/ `<ac:parameter ac:name="collapse">{{ .Collapse }}</ac:parameter>{{printf "\n"}}`,
 			/**/ `{{ if .Title }}<ac:parameter ac:name="title">{{ .Title }}</ac:parameter>{{printf "\n"}}{{ end }}`,
 			/**/ `<ac:plain-text-body><![CDATA[{{ .Text | cdata }}]]></ac:plain-text-body>{{printf "\n"}}`,
diff --git a/pkg/mark/testdata/codes.html b/pkg/mark/testdata/codes.html
index c2f8f806..4a1f879a 100644
--- a/pkg/mark/testdata/codes.html
+++ b/pkg/mark/testdata/codes.html
@@ -54,3 +54,37 @@
 </ac:structured-macro>
 </ac:rich-text-body>
 </ac:structured-macro>
+<ac:structured-macro ac:name="cloudscript-confluence-mermaid">
+<ac:parameter ac:name="showSource">true</ac:parameter>
+<ac:parameter ac:name="collapse">false</ac:parameter>
+<ac:plain-text-body><![CDATA[graph TD;
+    A-->B;
+    A-->C;
+    B-->D;
+    C-->D;]]></ac:plain-text-body>
+</ac:structured-macro>
+<ac:structured-macro ac:name="expand">
+<ac:parameter ac:name="title">my mermaid graph</ac:parameter>
+<ac:rich-text-body>
+<ac:structured-macro ac:name="cloudscript-confluence-mermaid">
+<ac:parameter ac:name="showSource">true</ac:parameter>
+<ac:parameter ac:name="collapse">true</ac:parameter>
+<ac:parameter ac:name="title">my mermaid graph</ac:parameter>
+<ac:plain-text-body><![CDATA[graph TD;
+    A-->B;
+    A-->C;
+    B-->D;
+    C-->D;]]></ac:plain-text-body>
+</ac:structured-macro>
+</ac:rich-text-body>
+</ac:structured-macro>
+<ac:structured-macro ac:name="cloudscript-confluence-mermaid">
+<ac:parameter ac:name="showSource">true</ac:parameter>
+<ac:parameter ac:name="collapse">false</ac:parameter>
+<ac:parameter ac:name="title">my mermaid graph</ac:parameter>
+<ac:plain-text-body><![CDATA[graph TD;
+    A-->B;
+    A-->C;
+    B-->D;
+    C-->D;]]></ac:plain-text-body>
+</ac:structured-macro>
diff --git a/pkg/mark/testdata/codes.md b/pkg/mark/testdata/codes.md
index efedcbc7..f0a91f9b 100644
--- a/pkg/mark/testdata/codes.md
+++ b/pkg/mark/testdata/codes.md
@@ -32,3 +32,27 @@ collapse-and-title
 ```c collapse
 collapse-no-title
 ```
+
+```mermaid
+graph TD;
+    A-->B;
+    A-->C;
+    B-->D;
+    C-->D;
+```
+
+```mermaid collapse title my mermaid graph
+graph TD;
+    A-->B;
+    A-->C;
+    B-->D;
+    C-->D;
+```
+
+```mermaid title my mermaid graph
+graph TD;
+    A-->B;
+    A-->C;
+    B-->D;
+    C-->D;
+```