diff --git a/commercial-support.html b/commercial-support.html
index 42ca2be17c..fc390c6ead 100644
--- a/commercial-support.html
+++ b/commercial-support.html
@@ -1,5 +1,21 @@
-<h1><a name="CommercialSupport-CommercialSupportandConsultingforApacheShiro"></a>Commercial Support and Consulting for Apache Shiro</h1>
+<h1><a name="CommercialSupport-CommercialSupportandConsultingforApacheShiro"></a>Service and Commercial Support for Apache Shiro</h1>
 
-<p>Shiro commercial support and consulting services are available from Stormpath, a company started by Shiro author and project chair, Les Hazlewood:</p>
+<div>
+<h3>
+    <a class="external-link" href="http://www.stormpath.com" title="Stormpath User Management">Apache Shiro Plugin for Stormpath User Management</a>
+</h3>
 
-<p><a class="external-link" href="http://www.stormpath.com/apache-shiro-support" rel="nofollow">http://www.stormpath.com/apache-shiro-support</a></p>
\ No newline at end of file
+<p>The <a href="https://github.com/stormpath/stormpath-shiro/wiki">Apache Shiro plugin for Stormpath</a> allows an Apache Shiro-enabled application to use the <a href="https://www.stormpath.com">Stormpath User Management & Authentication service</a> for all authentication and access control needs.  </p>
+
+<p>Pairing Shiro with Stormpath give you a full application security system complete with immediate user account support, admin UI, authentication service, account registration and password reset workflows, password security, and more-- with little to no coding on your part.</p>
+    <a class="external-link" href="https://github.com/stormpath/stormpath-shiro/wiki" title="Apache Shiro plugin for Stormpath">Learn More >>></a>
+<h3>
+    <a class="external-link" href="http://www.stormpath.com/apache-shiro-support" title="Stormpath Support for Apache Shiro">Stormpath Commercial Support for Apache Shiro</a>
+</h3>
+
+<p>Shiro commercial support and consulting services are available from Stormpath, a company started by Shiro committer and Project Chair, Les Hazlewood:
+</p>
+    <a class="external-link" href="http://www.stormpath.com/apache-shiro-support" title="Stormpath Support for Apache Shiro">Learn More >>></a>
+</div>
+<br>
+<p><strong>Providing Shiro services? Get listed on this page by posting to the <a href="mailing-lists.html" title="Shiro Mailing Lists">Dev Mailing list</a> </strong></p>
\ No newline at end of file