diff --git a/README.rst b/README.rst
index eaaa9906..7b79ee2d 100644
--- a/README.rst
+++ b/README.rst
@@ -22,9 +22,13 @@ frozenlist
    :target: https://aio-libs.discourse.group/
    :alt: Discourse group for io-libs
 
-.. image:: https://badges.gitter.im/Join%20Chat.svg
-   :target: https://gitter.im/aio-libs/Lobby
-   :alt: Chat on Gitter
+.. image:: https://img.shields.io/matrix/aio-libs:matrix.org?label=Discuss%20on%20Matrix%20at%20%23aio-libs%3Amatrix.org&logo=matrix&server_fqdn=matrix.org&style=flat
+   :target: https://matrix.to/#/%23aio-libs:matrix.org
+   :alt: Matrix Room — #aio-libs:matrix.org
+
+.. image:: https://img.shields.io/matrix/aio-libs-space:matrix.org?label=Discuss%20on%20Matrix%20at%20%23aio-libs-space%3Amatrix.org&logo=matrix&server_fqdn=matrix.org&style=flat
+   :target: https://matrix.to/#/%23aio-libs-space:matrix.org
+   :alt: Matrix Space — #aio-libs-space:matrix.org
 
 Introduction
 ============
@@ -95,7 +99,9 @@ Communication channels
 
 Feel free to post your questions and ideas here.
 
-*gitter chat* https://gitter.im/aio-libs/Lobby
+We have a *Matrix Space* `#aio-libs-space:matrix.org
+<https://matrix.to/#/%23aio-libs-space:matrix.org>`_ which is
+also accessible via Gitter.
 
 Requirements
 ============
diff --git a/docs/conf.py b/docs/conf.py
index 4222230b..918256c6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -180,10 +180,10 @@
             "alt": "Discourse group for io-libs",
         },
         {
-            "image": "https://badges.gitter.im/Join%20Chat.svg",
-            "target": "https://gitter.im/aio-libs/Lobby",
+            "image": "https://img.shields.io/matrix/aio-libs-space:matrix.org?label=Discuss%20on%20Matrix%20at%20%23aio-libs-space%3Amatrix.org&logo=matrix&server_fqdn=matrix.org&style=flat",
+            "target": "https://matrix.to/#/%23aio-libs-space:matrix.org",
             "height": "20",
-            "alt": "Chat on Gitter",
+            "alt": "Matrix Space",
         },
     ],
 }
diff --git a/docs/index.rst b/docs/index.rst
index 82eae7c1..7dd9b57b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -52,7 +52,9 @@ Communication channels
 
 Feel free to post your questions and ideas here.
 
-*gitter chat* https://gitter.im/aio-libs/Lobby
+We have a *Matrix Space* `#aio-libs-space:matrix.org
+<https://matrix.to/#/%23aio-libs-space:matrix.org>`_ which is
+also accessible via Gitter.
 
 Requirements
 ============
diff --git a/setup.cfg b/setup.cfg
index 7976002e..6353168b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,8 @@ name = frozenlist
 version = attr: frozenlist.__version__
 url = https://github.com/aio-libs/frozenlist
 project_urls =
-  Chat: Gitter = https://gitter.im/aio-libs/Lobby
+  Chat: Matrix = https://matrix.to/#/#aio-libs:matrix.org
+  Chat: Matrix Space = https://matrix.to/#/#aio-libs-space:matrix.org
   CI: Github Actions = https://github.com/aio-libs/frozenlist/actions
   Code of Conduct = https://github.com/aio-libs/.github/blob/master/CODE_OF_CONDUCT.md
   Coverage: codecov = https://codecov.io/github/aio-libs/frozenlist