diff --git a/README.md b/README.md
index c4cb75e7..753197c7 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,7 @@
 * Bug reports and feature requests: https://github.com/TracksApp/tracks/issues
 * Wiki (community contributed information): https://github.com/TracksApp/tracks/wiki
 * Mailing list: http://groups.google.com/group/TracksApp
-* IRC channel: #tracks on Freenode
-* Gitter: https://gitter.im/TracksApp/tracks
+* IRC channel: #tracks on Freenode, available also on [Matrix](https://matrix.to/#/#tracks:matrix.org)
 * Original developer: bsag (http://www.rousette.org.uk/)
 * Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP) (sponsored by Ardcoras oy, https://www.ardcoras.fi/)
 * Contributors: https://github.com/TracksApp/tracks/wiki/Contributors
diff --git a/app/views/integrations/help.html.erb b/app/views/integrations/help.html.erb
index 5cd0fca6..3ae78ec7 100644
--- a/app/views/integrations/help.html.erb
+++ b/app/views/integrations/help.html.erb
@@ -8,6 +8,6 @@
 
 <ul>
   <li><a href="http://groups.google.com/group/TracksApp">Mailing list</a></li>
-  <li><a href="https://gitter.im/TracksApp/tracks">Gitter chat</a></li>
   <li><a href="https://webchat.freenode.net/#Tracks">IRC channel #Tracks@FreeNode</li>
+  <li><a href="https://matrix.to/#/#tracks:matrix.org">Matrix chat</a> (bridged to the IRC channel)</li>
 </ul>