diff --git a/_layouts/formula.html b/_layouts/formula.html
index 711378446441..a399e35d6680 100644
--- a/_layouts/formula.html
+++ b/_layouts/formula.html
@@ -233,3 +233,47 @@
   {%- endfor -%}
 {%- endfor %}
 </table>
+
+<!-- Add separate tables for macOS and Linux dependencies -->
+{%- if f.mac_dependencies.size > 0 %}
+<p>macOS Dependencies:</p>
+<table>
+    {%- for dep in f.mac_dependencies -%}
+    <tr>
+        <td>{{ dep.name | escape }}</td>
+        <td>{{ dep.version | escape }}</td>
+    </tr>
+    {%- endfor -%}
+</table>
+{%- endif -%}
+
+{%- if f.linux_dependencies.size > 0 %}
+<p>Linux Dependencies:</p>
+<table>
+    {%- for dep in f.linux_dependencies -%}
+    <tr>
+        <td>{{ dep.name | escape }}</td>
+        <td>{{ dep.version | escape }}</td>
+    </tr>
+    {%- endfor -%}
+</table>
+{%- endif -%}
+
+<!-- Add separate sections for macOS and Linux caveats -->
+{%- if f.mac_caveats -%}
+<p>macOS Caveats:</p>
+<table class="full-width">
+    <tr>
+        <td>{{ f.mac_caveats | escape | replace: soft_indent, hard_indent | strip | newline_to_br }}</td>
+    </tr>
+</table>
+{%- endif -%}
+
+{%- if f.linux_caveats -%}
+<p>Linux Caveats:</p>
+<table class="full-width">
+    <tr>
+        <td>{{ f.linux_caveats | escape | replace: soft_indent, hard_indent | strip | newline_to_br }}</td>
+    </tr>
+</table>
+{%- endif -%}
diff --git a/_layouts/formula_json.json b/_layouts/formula_json.json
index 8c1f96477822..90edb5c3b555 100644
--- a/_layouts/formula_json.json
+++ b/_layouts/formula_json.json
@@ -36,4 +36,8 @@
   {%- endunless -%}
 {%- endfor -%}
 },
+"mac_dependencies":{{ fdata.mac_dependencies | jsonify }},
+"linux_dependencies":{{ fdata.linux_dependencies | jsonify }},
+"mac_caveats":{{ fdata.mac_caveats | jsonify }},
+"linux_caveats":{{ fdata.linux_caveats | jsonify }},
 "generated_date":"{{ "today" | date: "%F" }}"}
diff --git a/index.html b/index.html
index 3c3b10431ae3..220a703f0b64 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,7 @@
 ---
 layout: default
 ---
-<p><a href="{{ site.baseurl }}/">Homebrew Formulae</a> is an online package browser for <a href="https://brew.sh">Homebrew</a> – the macOS (and Linux) package manager. For more information on how to install and use Homebrew see <a href="https://brew.sh">our homepage</a>.</p>
+<p><a href="{{ site.baseurl }}/">Homebrew Formulae</a> is an online package browser for <a href="https://brew.sh">Homebrew</a> – the macOS and Linux package manager. For more information on how to install and use Homebrew see <a href="https://brew.sh">our homepage</a>.</p>
 
 <h2><a href="{{ site.baseurl }}/formula/">Browse all formulae</a></h2>
 <h2><a href="{{ site.baseurl }}/cask/">Browse all casks</a> or