diff --git a/content/contact.md b/content/contact.md
index e06cf5c..de2ee3d 100644
--- a/content/contact.md
+++ b/content/contact.md
@@ -5,13 +5,13 @@ page: true
 
 Email FSFE: {{< cloakemail address="max.mehl@fsfe.org" >}}\
 Email private: {{< cloakemail address="mail@mehl.mx" >}}\
+Matrix: {{< cloakemail address="@max.mehl:fsfe.org" protocol="matrix" >}}\
 XMPP: {{< cloakemail address="max.mehl@jabber.fsfe.org" protocol="xmpp" >}}
 
 Mastodon: [@mxmehl@mastodon.social](https://mastodon.social/@mxmehl)\
 Twitter: [@mxmehl](https://twitter.com/mxmehl)\
-Weblog: [mehl.mx/blog](/blog)\
-Diaspora: [mxmehl@diasp.eu](https://diasp.eu/u/mxmehl)\
-LinkedIn: [mxmehl](https://linkedin.com/in/mxmehl)
+LinkedIn: [mxmehl](https://linkedin.com/in/mxmehl)\
+Weblog: [mehl.mx/blog](/blog)
 
-GnuPG: [0x371E2E92](https://up.mehl.mx/mehl-current.pub.asc)\
+OpenPGP: [0x371E2E92](https://keys.fsfe.org/max.mehl@fsfe.org.asc)\
 OMEMO: [OMEMO Fingerprints](https://up.mehl.mx/mehl-omemo.asc)