diff --git a/_layouts/formula.html b/_layouts/formula.html
index 711378446441..7afd00196668 100644
--- a/_layouts/formula.html
+++ b/_layouts/formula.html
@@ -233,3 +233,42 @@
   {%- endfor -%}
 {%- endfor %}
 </table>
+
+<!-- Separate tables for macOS and Linux dependencies -->
+{%- if f.variations.size > 0 -%}
+    <p>Dependencies:</p>
+    <table>
+        <tr>
+            <th>OS</th>
+            <th>Dependencies</th>
+        </tr>
+        {%- for variation in f.variations -%}
+            <tr>
+                <td>{{ variation[0] | capitalize }}</td>
+                <td>
+                    {%- for dep in variation[1].dependencies -%}
+                        {{ dep | escape }}
+                        {%- unless forloop.last -%}, {% endunless -%}
+                    {%- endfor -%}
+                </td>
+            </tr>
+        {%- endfor -%}
+    </table>
+{%- endif -%}
+
+<!-- Separate sections for macOS and Linux caveats -->
+{%- if f.caveats -%}
+    <p>Caveats:</p>
+    <table>
+        <tr>
+            <th>OS</th>
+            <th>Caveats</th>
+        </tr>
+        {%- for variation in f.variations -%}
+            <tr>
+                <td>{{ variation[0] | capitalize }}</td>
+                <td>{{ variation[1].caveats | escape }}</td>
+            </tr>
+        {%- endfor -%}
+    </table>
+{%- endif -%}
diff --git a/_layouts/formula_json.json b/_layouts/formula_json.json
index 8c1f96477822..d68b7d5d3e68 100644
--- a/_layouts/formula_json.json
+++ b/_layouts/formula_json.json
@@ -36,4 +36,12 @@
   {%- endunless -%}
 {%- endfor -%}
 },
+"dependencies":{
+  "macos":{{ fdata.dependencies.macos | jsonify }},
+  "linux":{{ fdata.dependencies.linux | jsonify }}
+},
+"caveats":{
+  "macos":{{ fdata.caveats.macos | jsonify }},
+  "linux":{{ fdata.caveats.linux | 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