diff --git a/hugo/config.toml b/hugo/config.toml
--- a/hugo/config.toml
+++ b/hugo/config.toml
@@ -31,8 +31,8 @@
 		weight = 30
 
 	[[menu.main]]
-		name = "Mailing Lists"
-		url = "/mailing"
+		name = "Contact"
+		url = "/contact"
 		weight = 40
 
 	[[menu.main]]
diff --git a/hugo/content/mailing.md b/hugo/content/contact.md
rename from hugo/content/mailing.md
rename to hugo/content/contact.md
--- a/hugo/content/mailing.md
+++ b/hugo/content/contact.md
@@ -1,8 +1,27 @@
 ---
-title: "Mailing List"
+title: "Contact"
 date: 2018-05-03
+aliases:
+  - mailing
 ---
 
+## XMPP
+
+We run a federated XMPP instance on imfreedom.org, which means anyone with an
+XMPP account can join our conferences on conference.imfreedom.org. If you do not
+have an XMPP account, you can get a free
+[pidginchat.com](https://pidgin.im/about/pidginchat/) account which is able to
+join our conferences. For board members, please use your imfreedom.org accounts.
+More information about them can be found [here]({{< ref "xmpp" >}}).
+
+The following list describes the conferences we have on
+conferences.imfreedom.org.
+
+ * **board**: The board room, where discussions between the board happens.
+ * **discussion**: General discussion for Instant Messaging Freedom.
+ * **alerts**: A room for alerts and notifications for infrastructure and other
+   things.
+
 ## Mailing Lists
 
 Below is a listing of all the public mailing lists on imfreedom.org. Click on a
diff --git a/hugo/content/xmpp/add-account.png b/hugo/content/xmpp/add-account.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e6753838c9025ed24f60900b9c4ad1da3480293
GIT binary patch
diff --git a/hugo/content/xmpp/index.md b/hugo/content/xmpp/index.md
new file mode 100644
--- /dev/null
+++ b/hugo/content/xmpp/index.md
@@ -0,0 +1,49 @@
+---
+title: "XMPP"
+date: 2021-06-22
+---
+
+## imfreedom.org XMPP Service
+
+As mentioned on the [contact]({{< ref "contact" >}}) page, we run an XMPP
+instance for imfreedom.org. Accounts for this instance are tied to accounts
+on [hub](https://hub.imfreedom.org) and only work if you have been given access.
+Access is given to all current and former board members.
+
+To use this service, you'll need to add an account to your XMPP client. We'll
+walk through doing this in [Pidgin](https://pidgin.im/) below. Please note that
+if your [hub](https://hub.imfreedom.org) account has two factor authentication
+turned on, you will need to create and use an application password. See the
+Jetbrains Hub
+[documentation](https://www.jetbrains.com/help/hub/application-passwords.html)
+to learn how to do this.
+
+In the [Pidgin](https://pidgin.im/) "Add Account" dialog you need to enter
+the matching username for your [hub](https://hub.imfreedom.org) account. For
+the domain you need to enter `imfreedom.org`. You can then optionally set a
+resource to identify this client for yourself and others as well as a have
+[Pidgin](https://pidgin.im/) remember your password.
+
+{{< figure title="Add imfreedom.org Account Dialog" src="add-account.png" >}}
+
+Once everything looks correct, go ahead and click "Add" and the account should
+connect. If it doesn't please verify that all of the settings are correct
+including your password.
+
+Once you're connected you can join the board room by selecting
+`Buddies -> Join A Chat...` or by hitting `Ctrl-C` in the "Buddy List" window.
+This will open the "Join a Chat" dialog window.
+
+First you'll need to select the proper account if you have multiple accounts in
+this [Pidgin](https://pidgin.im/) instance. Next you'll want to enter `board`
+for the `Room` field. Server should be automatically set to
+`conference.imfreedom.org` but if it isn't please set it appropriately. You can
+also specify a custom "Handle" for yourself in this room. This handle is the
+name that is displayed to others. Once everything is set, go ahead and hit the
+join button.
+
+{{< figure title="Join a Chat Dialog" src="join-a-chat.png" >}}
+
+If everything went well you should have seen a new window, or a new tab in an
+existing window, pop up for the chat room. If this didn't happen please re-open
+the "Add a Chat" dialog and carefully re-enter the above settings.
diff --git a/hugo/content/xmpp/join-a-chat.png b/hugo/content/xmpp/join-a-chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f49b9bf3daf272b4d2efcee931c5c3cf335ecb4
GIT binary patch
