diff --git a/README.md b/README.md
index 2fa4fbb43bf5..bd47a3ca013f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Dotty
 =====
 [![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amaster)
-[![Join the chat at https://gitter.im/lampepfl/dotty](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lampepfl/dotty?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/scala/scala](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 * [Homepage](http://dotty.epfl.ch)
 * [Documentation](https://dotty.epfl.ch/docs)
diff --git a/docs/_layouts/main.html b/docs/_layouts/main.html
index 9637365c0231..c7aff4f96c5a 100644
--- a/docs/_layouts/main.html
+++ b/docs/_layouts/main.html
@@ -6,7 +6,7 @@
 </div>
 <script>
   ((window.gitter = {}).chat = {}).options = {
-    room: 'lampepfl/dotty'
+    room: 'scala/scala'
   };
 </script>
 <script src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer></script>
diff --git a/docs/docs/contributing/getting-started.md b/docs/docs/contributing/getting-started.md
index 1e8a9e5701d0..06981d0b0663 100644
--- a/docs/docs/contributing/getting-started.md
+++ b/docs/docs/contributing/getting-started.md
@@ -90,3 +90,11 @@ For more information, see `scaladoc/README.md`.
 
 Before contributing to Dotty, we invite you to consult the
 [Dotty Developer Guidelines](https://github.com/lampepfl/dotty/blob/master/CONTRIBUTING.md).
+
+
+Community
+-------------
+The main development discussion channels are:
+- [github.com/lampepfl/dotty/discussions](github.com/lampepfl/dotty/discussions)
+- [contributors.scala-lang.org](contributors.scala-lang.org)
+- [gitter.im/scala/contributors](gitter.im/scala/contributors)