diff --git a/src/documentation/content/xdocs/casestudies.xml b/src/documentation/content/xdocs/casestudies.xml
index bff23d1bd4..1f5ce66e59 100644
--- a/src/documentation/content/xdocs/casestudies.xml
+++ b/src/documentation/content/xdocs/casestudies.xml
@@ -45,12 +45,9 @@
         <section>
             <title>Submitting a Case Study</title>
             <p>
-                We are actively seeking case studies for this page (after all it
-                just started). To submit a case study, either
-                <a href="site:guidelines">
-                    submit a patch for this page</a> or email it to the
-                <a href="site:mailinglists">mailing list
-                </a> (with [PATCH] prefixed subject, please).
+                We are actively seeking case studies for this page. If you want to submit a case study,
+                please raise an issue with the text that you would like to include in our
+                <a href="site:help">Bug Database</a>.
             </p>
         </section>
         <section>
diff --git a/src/documentation/content/xdocs/commercial-support.xml b/src/documentation/content/xdocs/commercial-support.xml
new file mode 100644
index 0000000000..1a7c7844d0
--- /dev/null
+++ b/src/documentation/content/xdocs/commercial-support.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   ====================================================================
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "document-v20.dtd">
+
+<document>
+  <header>
+    <title>Apache POI™ - Commercial Support</title>
+    <authors>
+      <person id="PJF" name="PJ Fanning" email="fanningpj@apache.org"/>
+    </authors>
+  </header>
+
+  <body>
+    <section><title>Vendor Neutrality</title>
+      <p>
+        This page is dedicated to companies offering products and services around or including Apache POI.
+      </p>
+      <p>
+        The Apache POI PMC does not endorse or recommend any of the products or services on this page.
+      </p>
+      <p>
+        If you want your product or service listed on this page, please raise an issue with some details in our
+        <a href="help/index.html">Bug Database</a>.
+      </p>
+    </section>
+    <section><title>Long Term Support</title>
+      <p>
+        <a href="https://www.herodevs.com/support?utm_source=Referral&amp;utm_medium=link&amp;utm_campaign=PoiReferralLink&amp;utm_id=Poi">HeroDevs</a>
+        offers security and compatibility support for EOL versions of Apache POI. Find out more about their
+        <a href="https://www.herodevs.com/support?utm_source=Referral&amp;utm_medium=link&amp;utm_campaign=PoiReferralLink&amp;utm_id=Poi">Never Ending Support options</a>.
+      </p>
+    </section>
+  </body>
+  <footer>
+    <legal>
+      Copyright (c) @year@ The Apache Software Foundation All rights reserved.
+      <br />
+      Apache POI, POI, Apache, the Apache logo, and the Apache 
+      POI project logo are trademarks of The Apache Software Foundation.
+    </legal>
+  </footer>
+</document>
diff --git a/src/documentation/content/xdocs/devel/guidelines.xml b/src/documentation/content/xdocs/devel/guidelines.xml
index b153397498..495f52a638 100644
--- a/src/documentation/content/xdocs/devel/guidelines.xml
+++ b/src/documentation/content/xdocs/devel/guidelines.xml
@@ -113,8 +113,8 @@
   <anchor id="SubmittingPatches"/>
   <section><title>Submitting Patches</title>
    <p>
-     If you use GitHub, you can submit Pull Requests to https://github.com/apache/poi. It is probably
-     a good idea to create an issue in the <a href="https://issues.apache.org/bugzilla/buglist.cgi?product=POI">Bug Database</a>
+     If you use GitHub, you can submit Pull Requests to <a href="https://github.com/apache/poi">https://github.com/apache/poi</a>.
+     It is probably a good idea to create an issue in the <a href="https://issues.apache.org/bugzilla/buglist.cgi?product=POI">Bug Database</a>
      first and reference it in the PR.
    </p>
    <p>
diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml
index fbfcdcfdf0..a419f1a4bb 100644
--- a/src/documentation/content/xdocs/site.xml
+++ b/src/documentation/content/xdocs/site.xml
@@ -42,6 +42,7 @@ See https://xml.apache.org/forrest/linking.html for more info
         <encryption label="Secure processing" href="security.html"/>
         <casestudies label="Case Studies" href="casestudies.html"/>
         <related label="Related projects" href="related-projects.html"/>
+        <commercialsupport label="Commercial Support" href="commercial-support.html"/>
         <legal label="Legal" href="legal.html"/>
     </home>
     <apache label="Apache Wide" tab="home">
diff --git a/src/documentation/content/xdocs/versioning.xml b/src/documentation/content/xdocs/versioning.xml
index fcb141df58..2d759fb675 100644
--- a/src/documentation/content/xdocs/versioning.xml
+++ b/src/documentation/content/xdocs/versioning.xml
@@ -66,6 +66,9 @@
         offers security and compatibility support for EOL versions of Apache POI. Find out more about their
         <a href="https://www.herodevs.com/support?utm_source=Referral&amp;utm_medium=link&amp;utm_campaign=PoiReferralLink&amp;utm_id=Poi">Never Ending Support options</a>.
       </p>
+      <p>
+        Please see our dedicated <a href="site:commercialsupport">Commercial Support</a> page for more information and our Vendor Neutrality statement.
+      </p>
     </section>
     <section><title>Migrating from older versions</title>
       <p>
