diff --git a/site/content/docs/_index.md b/site/content/docs/_index.md
index eae992274..34ea813f8 100644
--- a/site/content/docs/_index.md
+++ b/site/content/docs/_index.md
@@ -51,6 +51,10 @@ groups:
         link: /docs/statistics/
         desc: public ZAP usage statistics
     
+      - name: 'Software Bill of Materials'
+        link: /docs/sbom/
+        desc: ZAP add-on SBOMs
+    
   - header: 'Internal Details'
     links:
 
diff --git a/site/content/docs/sbom/_index.md b/site/content/docs/sbom/_index.md
new file mode 100644
index 000000000..517f2ca4b
--- /dev/null
+++ b/site/content/docs/sbom/_index.md
@@ -0,0 +1,13 @@
+---
+title: "Software Bill of Materials"
+type: sbom
+---
+ZAP includes a runtime Software Bill of Materials (SBOM) generated by [CycloneDX](https://cyclonedx.org/) for both the ZAP core and all of the add-ons maintained by the ZAP team. Each SBOM will appear as a file called “bom.json” included at the root of the ZAP JARs.
+
+Runtime SBOMs for the ZAP core and the add-ons you have installed can be accessed in ZAP as per the [Software Bill of Materials](/docs/desktop/start/features/sbom/)
+help page.
+
+Note that SBOMs may not be available if you run ZAP from the source code, and some 3rd party add-ons may also not define them.
+
+The full set of available build time add-on SBOMs are:
+
diff --git a/site/layouts/sbom/list.html b/site/layouts/sbom/list.html
new file mode 100644
index 000000000..739c21a40
--- /dev/null
+++ b/site/layouts/sbom/list.html
@@ -0,0 +1,30 @@
+{{ define "main" }}
+<section class="bolt-header">
+  <div class="wrapper py-20">
+    <h1 class="text--white">{{ .Title }}</h1>
+  </div>
+</section>
+  <div class="wrapper py-70">
+  	{{- .Content -}}
+  	
+  	<table class="table">
+    <thead  align="left">
+    <tr>
+        <th style="width: 80%">Name</th>
+        <th style="width: 20%">Components</th>
+    </tr>
+    </thead>
+    
+    {{ range .Pages }}
+    <tr>
+          <td>
+            <a href="{{ .Permalink }}">{{ .Title }}</a>
+          </td>
+          <td>
+            {{ len .Params.sbom.components }}
+          </td>
+    </tr>
+    {{ end }}
+    
+</table>
+{{ end }}
\ No newline at end of file
diff --git a/site/layouts/sbom/single.html b/site/layouts/sbom/single.html
index 08b59e6b5..d86703876 100755
--- a/site/layouts/sbom/single.html
+++ b/site/layouts/sbom/single.html
@@ -9,7 +9,7 @@ <h1 class="text--white">{{ .Title }}</h1>
 <div class="wrapper py-20" data-kind="{{ .Kind }}">
   <header class="breadcrumbs">
     <a href="/docs/">Docs</a> &gt;
-    SBOM &gt;
+    <a href="/docs/sbom/">SBOM</a> &gt;
     <a href="/docs/sbom/{{ $addOn.id }}">{{ $addOn.name }}</a>
   </header>
   <br>