diff --git a/_includes/sections/paste-services.html b/_includes/sections/paste-services.html
index ecfdc8ad..788d8210 100644
--- a/_includes/sections/paste-services.html
+++ b/_includes/sections/paste-services.html
@@ -7,4 +7,14 @@ description="PrivateBin is a minimalist, open source online pastebin where the s
website="https://bin.privacytools.io/"
forum="https://forum.privacytools.io/t/discussion-privatebin/296"
github="https://github.com/PrivateBin/PrivateBin"
-%}
\ No newline at end of file
+%}
+
+
+{% include cardv2.html
+title="CryptPad"
+image="/assets/img/provider/CryptPad.png"
+description="CryptPad is an open source, zero knowledge, realtime collaborative editor. Data is encrypted/decrypted in the browser using 256bit AES."
+website="https://cryptpad.fr/pad/"
+forum="https://forum.privacytools.io/t/discussion-cryptpad/1270"
+github="https://github.com/xwiki-labs/cryptpad"
+%}
diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html
new file mode 100644
index 00000000..3550bf3c
--- /dev/null
+++ b/_includes/sections/teamchat.html
@@ -0,0 +1,41 @@
+
Team chat applications where everything is end-to-end encrypted or under the control of your team administrator
+
+
+
If your project currently uses a team chat like Discord or Slack you should pick an alternative here.
+
+
+{% 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.
Experimental "
+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
indepedently audited (PDF).
experimental (GitHub issue)'
+website="https://keybase.io/"
+forum="https://forum.privacytools.io/t/discussion-keybase/1224"
+github="https://github.com/Keybase"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+web=""
+%}
+
+
+
Worth Mentioning
+
+
+ - Wire Pro - Paid team communication with E2EE. Untested
+
diff --git a/assets/css/style.scss b/assets/css/style.scss
index 90626c1f..7ccd8321 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -182,4 +182,4 @@ footer {
i {
margin-right: 1rem;
}
-}
+}
\ No newline at end of file
diff --git a/assets/img/tools/keybase.png b/assets/img/tools/keybase.png
new file mode 100644
index 00000000..d8081eec
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 00000000..904efe19
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 00000000..83700206
--- /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 20b4602d..3e18eb20 100644
--- a/source_code.md
+++ b/source_code.md
@@ -136,6 +136,12 @@ Backend: closed-source
Ricochet: https://github.com/ricochet-im/ricochet
+## Team chat
+
+ Rocket.chat: https://github.com/rocketchat/
+
+ Keybase: https://github.com/Keybase
+
## Encrypted Video & Voice Messenger
Signal: https://github.com/signalapp
@@ -328,6 +334,8 @@ PowerDNS: https://github.com/PowerDNS/pdns
ZeroBin: https://github.com/sebsauvage/ZeroBin
Ghostbin: https://github.com/kilgarth/ghostbin
+
+ CryptPad: https://github.com/xwiki-labs/cryptpad
Worth Mentioning: