diff --git a/_layouts/community.html b/_layouts/community.html
index f87ea72..0d8c2a8 100644
--- a/_layouts/community.html
+++ b/_layouts/community.html
@@ -170,6 +170,12 @@
     <ul>
       <li><a href="#community">Community</a></li>
 
+      <!-- Mailing lists -->
+      <li><a href="#mailing-lists">Mailing Lists</a></li>
+
+      <!-- Issue Trackers -->
+      <li><a href="#issue-trackers">Issue Trackers</a></li>
+
       <!-- Social Media -->
       <li class="index-menu-toggle"><a href="#social">Media</a></li>
       <ul class="index-menuitems">
@@ -181,9 +187,6 @@
         <li><a href="#slideshare">Slideshare</a></li>
       </ul>
 
-      <!-- Mailing lists -->
-      <li><a href="#mailing-lists">Mailing Lists</a></li>
-
       <!-- Project Wiki -->
       <li><a href="#wiki">Project Wiki</a></li>
 
@@ -236,6 +239,23 @@
                 <a href="https://lists.apache.org/list.html?dev@openwhisk.apache.org">https://lists.apache.org/list.html?dev@openwhisk.apache.org</a>.</p>
           </div>
       </main>
+
+      <main class="doc">
+          <div class="content">
+              <a class="indexable" id="issue-trackers"></a>
+              <h3>Issue Trackers</h3>
+              <p>The project uses GitHub issues to report non-security related bug reports and feature requests. Please see <a href="https://openwhisk.apache.org/security.html">https://openwhisk.apache.org/security.html</a> for information on how to report a suspected security vulnerability with OpenWhisk.</p>
+              <p>Each of the sub-components of OpenWhisk uses the issue tracker associated with its GitHub project for tracking its own issues.  If you are not sure where to start, the <a href="https://github.com/apache/openwhisk/issues">OpenWhisk Core Issue Tracker</a> is the best place to start.  Some of the most frequently used issue trackers are:
+                <ul>
+                  <li><a href="https://github.com/apache/openwhisk/issues">Core OpenWhisk system</a></li>
+                  <li><a href="https://github.com/apache/openwhisk-deploy-kube/issues">OpenWhisk on Kubernetes</a></li>
+                  <li><a href="https://github.com/apache/openwhisk-cli/issues">OpenWhisk CLI (wsk)</a></li>
+                  <li><a href="https://github.com/apache/openwhisk-website/issues">OpenWhisk website</a></li>
+                  <li><a href="https://github.com/apache/openwhisk/blob/master/docs/dev/modules.md">List of all OpenWhisk sub-components and their GitHub project</a></li>
+                </ul>
+              </p>
+          </div>
+      </main>
       <main class="doc">
           <div class="content">
               <a class="indexable" id="social"></a>
@@ -271,7 +291,6 @@
                   <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/Proposals">Proposals</a> (Design)</li>
                   <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/Presentations%2C+Meeting+Notes+and+Transcripts">Meeting Notes and Transcripts</a></li>
                   <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/Processes">Processes</a></li>
-                  <li><a href="https://cwiki.apache.org/confluence/display/OPENWHISK/Project+Status">Project Status</a></li>
                   <!-- NOTE: we have no policies now so do not link until they exist -->
                   <!-- <li><a href="">Policies</a></li> -->
               </ul>