diff --git a/layouts/_default/cli.html b/layouts/_default/cli.html
index 32905f1028..cf989b2367 100644
--- a/layouts/_default/cli.html
+++ b/layouts/_default/cli.html
@@ -169,6 +169,28 @@
       {{ end }}
       {{ $.RenderString (dict "display" "block") . }}
     {{ end }}
+    {{ if eq .Kind "section" }}
+      {{ $heading := dict "level" 2 "text" "Subcommands" }}
+      {{ partial "heading.html" $heading }}
+      {{ $.Scratch.Add "headings" $heading }}
+      <table>
+        <thead>
+          <tr>
+            <th class="text-left">Command</th>
+            <th class="text-left">Description</th>
+          </tr>
+        </thead>
+        <tbody>
+          {{ range .Pages }}
+            <tr>
+              <td class="text-left"><a class="link" href="{{ .Permalink }}"><code>{{ .Title }}</code></a></th>
+              {{ $data := index (index site.Data .Params.datafolder) .Params.datafile }}
+              <td class="text-left">{{ $data.short }}</th>
+            </tr>
+          {{ end }}
+        </tbody>
+      </table>
+    {{ end }}
   </article>
 {{ end }}