diff --git a/docs/_static/infra/matrix-riot-communities.png b/docs/_static/infra/matrix-riot-communities.png
new file mode 100644
index 0000000..6b206fc
Binary files /dev/null and b/docs/_static/infra/matrix-riot-communities.png differ
diff --git a/docs/infra/matrix.md b/docs/infra/matrix.md
new file mode 100644
index 0000000..1b91a9d
--- /dev/null
+++ b/docs/infra/matrix.md
@@ -0,0 +1,48 @@
+Matrix
+======
+
+This page documents the use of the [Matrix.org network](https://matrix.org/) and [Riot chat client](https://about.riot.im/) in the FOSS@RIT community.
+Matrix is a decentralized chat network while Riot is one (of many) possible clients for participating in the chat network.
+
+
+## How we use Matrix
+
+Matrix is convenient for us because it offers compatibility with existing IRC networks, such as Freenode.
+Since the FOSS@RIT community was established on Freenode in 2010, we have a historical presence on IRC (see [IRC (Freenode)](irc)).
+Matrix/Riot provides a modern user interface in a chat client and integrates nicely into existing IRC channels.
+Many FOSS@RIT community members use the Matrix network, but can communicate seamlessly with IRC channels.
+
+For help using Matrix/Riot, refer to the following links:
+
+* [IRC for the 21st Century: Introducing Riot](https://opensource.com/article/17/5/introducing-riot-IRC "IRC for the 21st Century: Introducing Riot - opensource.com")
+* [How do I register/identify to NickServ?](https://github.com/matrix-org/matrix-appservice-irc/wiki/End-user-FAQ#how-do-i-registeridentify-to-nickserv "How do I register/identify to NickServ? - github.com")
+
+
+## RIT community
+
+In 2017, [Riot.im announced communities](https://medium.com/@RiotChat/communities-aka-groups-are-here-announcing-riot-web-0-13-riot-ios-0-6-and-riot-android-0-7-4-933cb193a28e), a feature that groups rooms and users together (similar to a Slack team or a Discord server).
+(Note eventually this will be replaced by [Groups-as-Rooms](https://github.com/matrix-org/matrix-doc/pull/1772).)
+There is a RIT community on the `matrix.org` homeserver: `+rit:matrix.org` ([view on Riot](https://riot.im/app/#/group/+rit:matrix.org "Click to open RIT community on Riot.im")).
+
+![Screenshot of Communities button in Riot.im web client](/_static/infra/matrix-riot-communities.png "Screenshot of Communities button in Riot.im web client")
+
+The RIT community is owned by `@jflory7:matrix.org`.
+At the time of writing, it is not possible to add other admins to communities.
+
+
+## Known rooms
+
+The following is a list of all known Matrix rooms related to RIT or the FOSS@RIT community.
+
+| Name                              | Room address                                                                                  |
+|-----------------------------------|-----------------------------------------------------------------------------------------------|
+| RIT FOSS Infrastructure           | [`#rit-foss-admin:matrix.org`](https://riot.im/app/#/room/#rit-foss-admin:matrix.org)         |
+| RIT Free and Open Source          | [`#ritfoss:matrix.org`](https://riot.im/app/#/room/#ritfoss:matrix.org)                       |
+| RIT LibreCorps                    | [`#rit-librecorps:matrix.org`](https://riot.im/app/#/room/#rit-librecorps:matrix.org)         |
+| RIT Linux Users Group             | [`#rit-lug:matrix.org`](https://riot.im/app/#/room/#rit-lug:matrix.org)                       |
+| RIT Python                        | [`#rit-python:matrix.org`](https://riot.im/app/#/room/#rit-python:matrix.org)                 |
+| RIT Sustainability Chat           | [`#rit-sustainability:matrix.org`](https://riot.im/app/#/room/#rit-sustainability:matrix.org) |
+| RIT Sustainability Events         | [`#rit-eco-events:matrix.org`](https://riot.im/app/#/room/#rit-eco-events:matrix.org)         |
+| RITlug community projects         | [`#rit-lug-projects:matrix.org`](https://riot.im/app/#/room/#rit-lug-projects:matrix.org)     |
+| Rochester Institute of Technology | [`#rit:matrix.org`](https://riot.im/app/#/room/#rit:matrix.org)                               |
+| TeleIRC                           | [`#rit-lug-teleirc:matrix.org`](https://riot.im/app/#/room/#rit-lug-teleirc:matrix.org)       |