diff --git a/docs/index.md b/docs/index.md
index 482bb76e67341adb19604c3fea7ae1f6dafff0ed..13de4271d1f66c9cba5973508405addf8f0794b2 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -51,10 +51,6 @@ plans for new development, reach out online.
       <td><a href="https://civicrm.org/blog">Blog</a></td>
       <td>Read about the big developments</td>
     </tr>
-    <tr>
-      <td><a href="http://forum.civicrm.org/">Forum</a></td>
-      <td>Converse in the public square</td>
-    </tr>
     <tr>
       <td><a href="https://github.com/civicrm/civicrm-core/">Github</a></td>
       <td>Tap the firehose of core development</td>
@@ -63,14 +59,18 @@ plans for new development, reach out online.
       <td><a href="FIXME">Guidelines</a></td>
       <td>Check the rules of the road</td>
     </tr>
-    <tr>
-      <td><a href="https://irc.civicrm.org/">IRC</a></td>
-      <td>Chat with other developers in real-time</td>
-    </tr>
     <tr>
       <td><a href="http://issues.civicrm.org/">Issues</a></td>
       <td>Discover on-going and resolved issues</td>
     </tr>
+    <tr>
+      <td><a href="http://lists.civicrm.org/lists/info/civicrm-dev">Mailing List</a></td>
+      <td>Converse in the public square</td>
+    </tr>
+    <tr>
+      <td><a href="https://chat.civicrm.org/">Mattermost</a></td>
+      <td>Chat with other developers in real-time</td>
+    </tr>
     <tr>
       <td><a href="FIXME">Publish</a></td>
       <td>Share your extensions</td>