diff --git a/README.md b/README.md
index 7a72d7cc8..09cfadbcc 100644
--- a/README.md
+++ b/README.md
@@ -51,8 +51,11 @@ If you want to compile the kernel yourself (e.g. if your distribution is not sup
 
 ### Support
 
-If you have questions or need support, please use our [Gitter Community][gitter]!
-For development related questions and discussions, please consider joining our IRC channel on freenode (`freenode/##linux-surface`) or the [equivalent Matrix bridge](https://matrix.to/#/#freenode_##linux-surface:matrix.org).
+If you have questions or need support, please join our [Matrix Space][matrix-space]!
+This space contains
+- a [support channel][matrix-support] for general support and
+- a [development channel][matrix-development] for all development related questions and discussions.
+  If you prefer IRC, you can also join in via our channel at [`libera.chat/#linux-surface`][liberachat], to which the matrix room is bridged to.
 
 ## License
 This repository contains patches, which are either derivative work targeting a specific already licensed source, i.e. parts of the Linux kernel, or introduce new parts to the Linux kernel.
@@ -64,7 +67,11 @@ License texts can be obtained at https://github.com/torvalds/linux/tree/master/L
 [wiki-setup]: https://github.com/linux-surface/linux-surface/wiki/Installation-and-Setup
 [wiki-compiling]: https://github.com/linux-surface/linux-surface/wiki/Compiling-the-Kernel-from-Source
 
-[gitter]: https://gitter.im/linux-surface
+[matrix-space]: https://matrix.to/#/#linux-surface:matrix.org
+[matrix-support]: https://matrix.to/#/#linux-surface-support:matrix.org
+[matrix-development]: https://matrix.to/#/#linux-surface-development:matrix.org
+[liberachat]: https://web.libera.chat/#linux-surface
+
 [hibernate-setup]: https://fitzcarraldoblog.wordpress.com/2018/07/14/configuring-lubuntu-18-04-to-enable-hibernation-using-a-swap-file
 [releases]: https://github.com/linux-surface/linux-surface/releases