diff --git a/README.md b/README.md
index e308675..ae276b8 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,9 @@ You can download the latest git builds for Linux and Windows on [the Gitlab page
 
 One of the reasons I made this code open source is because I want contributions. Unless your code is related to the experimental stuff it needs to work on both Linux and Windows. Having accurate behavior is more important than making games work. Having inaccurate behavior might fix one game but it will break others.
 
-## IRC Channel
+## Matrix Channel
 
-[#goldberg_emulator@freenode](https://webchat.freenode.net/?channels=goldberg_emulator)
+[#goldberg:matrix.org](https://matrix.to/#/#goldberg:matrix.org)
 
 ## Building
 
diff --git a/website/template.html b/website/template.html
index 7c314ff..53c3bfa 100644
--- a/website/template.html
+++ b/website/template.html
@@ -17,7 +17,7 @@
 <div>There's also a Readme in the zip that you download. Most issues can be easily resolved by reading it (The first few lines are the most important). </div>
 
 <h3>Chatroom</h3>
-<div>Matrix room: <a href="https://element.io/app/#/room/#goldberg:matrix.org">Element</a></div>
+<div>Matrix room: <a href="https://matrix.to/#/#goldberg:matrix.org">#goldberg:matrix.org</a></div>
 
 <h3>Other Links</h3>
 <div><a href="https://www.reddit.com/r/GoldbergEmu/">Subreddit</a></div>