diff --git a/_includes/nav.html b/_includes/nav.html
index 18e6c3d40..400a7b369 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -47,6 +47,7 @@
             <a class="dropdown-item" href="/software/encryption-tools/"><i class="fas fa-lock fa-fw"></i> File Encryption</a>
             <a class="dropdown-item" href="/software/file-sharing/"><i class="fas fa-file-export fa-fw"></i> File Sharing</a>
             <a class="dropdown-item" href="/software/im/"><i class="fab fa-telegram-plane fa-fw"></i> Instant Messenger</a>
+            <a class="dropdown-item" href="/software/teamchat/"><i class="fas fa-users fa-fw"></i> Team chat</a>
             <a class="dropdown-item" href="/software/passwords/"><i class="fas fa-user-lock fa-fw"></i> Password Manager</a>
             <a class="dropdown-item" href="/software/productivity/"><i class="fas fa-briefcase fa-fw"></i> Productivity Tools</a>
             <a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy fa-fw"></i> Secure File Sync</a>
diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html
new file mode 100644
index 000000000..3550bf3c7
--- /dev/null
+++ b/_includes/sections/teamchat.html
@@ -0,0 +1,41 @@
+<h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link anchor-icon"></i></a> Team chat applications where everything is end-to-end encrypted or under the control of your team administrator</h1>
+
+<div class="alert alert-warning" role="alert">
+        <strong>If your project currently uses a team chat like <a href="https://web.archive.org/web/20171029114027/https://feedback.discordapp.com/forums/326712-discord-dream-land/suggestions/17094256-implement-whispersystems-encryption-for-voice-and">Discord</a> or <a href="https://drewdevault.com/2015/11/01/Please-stop-using-slack.html">Slack</a> you should pick an alternative here.</strong>
+</div>
+
+{% include cardv2.html
+title="Rocket.chat"
+image="/assets/img/tools/rocket.chat.png"
+description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE. <a href=\"https://rocket.chat/docs/user-guides/end-to-end-encryption/\"><span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"The documentation says this of E2EE: 'Note: This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. The federation was also added afterwards potentially causing room for mistakes.'\">Experimental <i class=\"far fa-question-circle\"></i></a></span>"
+website="https://rocket.chat/"
+forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
+github="https://github.com/rocketchat/"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+%}
+
+{% include cardv2.html
+title="Keybase"
+image="/assets/img/tools/keybase.png"
+description='Keybase provides a hosted team chat with end-to-end encryption. It has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. <span class="badge badge-warning" data-toggle="tooltip" title="The server side of Keybase runs on proprietary code and is centralized">experimental <i class="far fa-question-circle"></i> (<a href="https://github.com/keybase/client/issues/6374">GitHub issue</a>)</span>'
+website="https://keybase.io/"
+forum="https://forum.privacytools.io/t/discussion-keybase/1224"
+github="https://github.com/Keybase"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+web=""
+%}
+
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://wire.com/en/products/pro-secure-team-collaboration/">Wire Pro</a> - Paid team communication with E2EE. <span class="badge badge-warning" data-toggle="tooltip" title="The Privacytools.io team has no experience with Wire Pro, while we can recommend the free version.">Untested<i class="far fa-question-circle"></i></span></li>
+</ul>
diff --git a/assets/img/tools/keybase.png b/assets/img/tools/keybase.png
new file mode 100644
index 000000000..d8081eec7
Binary files /dev/null and b/assets/img/tools/keybase.png differ
diff --git a/assets/img/tools/rocket.chat.png b/assets/img/tools/rocket.chat.png
new file mode 100644
index 000000000..904efe19e
Binary files /dev/null and b/assets/img/tools/rocket.chat.png differ
diff --git a/pages/software/teamchat.html b/pages/software/teamchat.html
new file mode 100644
index 000000000..837002067
--- /dev/null
+++ b/pages/software/teamchat.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/teamchat/
+title: "Team chat"
+description: "Discover secure and private ways to communicate with your team online without letting any third parties read your messages."
+---
+
+{% include sections/teamchat.html %}
diff --git a/source_code.md b/source_code.md
index 78abc91f2..1d315de0c 100644
--- a/source_code.md
+++ b/source_code.md
@@ -130,6 +130,12 @@ Backend: closed-source
  
  Wire: https://github.com/wireapp
 
+## Team chat
+
+ Rocket.chat: https://github.com/rocketchat/
+ 
+ Keybase: https://github.com/Keybase
+
 ## Encrypted Video & Voice Messenger
  Signal: https://github.com/signalapp