diff --git a/index.md b/index.md
index e4fa469..ad2cbe0 100644
--- a/index.md
+++ b/index.md
@@ -10,6 +10,9 @@ Hi! I'm Jesper. This page is just a place where I advertise my current set of cr
 * [About Me](https://about.me/graffen)
 * [PGP Key Signing Policy](/keysigning/policy/) [[Signed version]](/keysigning/policy/index.md.asc)
 
+# Jabber / XMPP
+graffen.dk hosts a jabber/xmpp server that is open for anyone to use. See more [here](/jabber)
+
 # Crypto
 Get a GPG-signed version of the markdown behind this page [here](index.md.asc). Use this signature to verify that 
 the below information is correct.
diff --git a/index.md.asc b/index.md.asc
index d493efe..ef07048 100644
--- a/index.md.asc
+++ b/index.md.asc
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 - ---
 layout: default
@@ -13,6 +13,9 @@ Hi! I'm Jesper. This page is just a place where I advertise my current set of cr
 * [About Me](https://about.me/graffen)
 * [PGP Key Signing Policy](/keysigning/policy/) [[Signed version]](/keysigning/policy/index.md.asc)
 
+# Jabber / XMPP
+graffen.dk hosts a jabber/xmpp server that is open for anyone to use. See more [here](/jabber)
+
 # Crypto
 Get a GPG-signed version of the markdown behind this page [here](index.md.asc). Use this signature to verify that 
 the below information is correct.
@@ -40,18 +43,19 @@ The following keys have been superseded by the above. Please don't use these to
 * Jabber: graffen@graffen.dk/Laptop: `00C4C549 F8AEE802 A72452DC 50505408 2FB0AC91`
 * Jabber: graffen@graffen.dk/Home: `59C3E1EF 4D17DB9F A73FB5C3 4AEEFE35 76FB11A9`
 -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
 
-iQIcBAEBCgAGBQJW7vl8AAoJEDUaieQNdj8P6pIP/3cBODbpKOyis6UIoaTulXUS
-UVBoyBsLkckl/jncDR6eJ/K74GMo5CzOsGBL4evrJFwTHOaGkzUMlfF01KlbzHOF
-GWiG4vGzCBp0DzP4p52CJw3ir+jP5b89ysdmJyE/PhjQDT65j+3ru5ld6UUGqEtf
-3BDORUIo+8bZnErATqTUMkG231FCs6ksU0h1+u+QaieujOdb8aIE++dH40PigZvl
-Yl1Up5ZFVoJJphU7VCFHsuuuuPYNnTmVTCQlf8Lpbs1/JU9VKDp7sV30hEgYjX4f
-rAMC1+Jhb40nZgKICMCjxypJmbHYANZFEqfId9q7fY3ZyMjPLiCUIh6Muh99da3D
-0/+Zp4GHJo10NzW7F4lMgWeJtXQBGeeSYlkqztOM58/M2uYjcVMofPD4b6qHjWFn
-newBxc012foU2fn27pEK6ozGG7oe4IzXmi+rGTGCUR5WdnSlNSuVy8+30Svl5QFc
-oiKyJN8Dax9CxRvZ8QtM9skotEcEhsQdG/F/sgYQg+qX/sic7STUw49/f5r4hxC2
-LCqmfCNItCICTErJwP/VMX2Lem3MZP9L49qm/Y476lXplYd9lVh51gr9o4IvsX2g
-WRCV2P1laKCZNT74gm1fkv47K/TUcB/rS9HUerqgeuX9tTy3MppMICkREn+8QNau
-4oxNB+HI++O9kFBTZHlM
-=G9jM
+iQIcBAEBCAAGBQJW/QwhAAoJEDUaieQNdj8PjUcP/ieImE4Y09UVfDZXKfaaYCrh
+DOl1MqOsPuyV5qtlFyy020cIZjnZ2vnRGJ2BMiTwBIMce4bbB6FuJIiXMrTAYTax
+bLXv29fUoi3Hme4w24tzWqthAcxVPnLhwCghiBeVBem/knQm1vKvGPEjv5X5iBzJ
+dtos1aHHexhp95+HpdTOjBcOjHJmEwMQP4hdRV4m9NsKLFts5pkChv4SKUCaA54x
+6gtXzcVr1/ryUsDWKR8VYUnKLWXMmgvyIWZKZQAKMjZaeeVu7t2f/ix5xnyB5nHM
+KVMWWGm+KEDW1x/WSH8o4PTCQpKWJfA5+ar+gRGNyQoq/63Jt9Q6wUypkRNavkJk
+8pNyPMUeQfqeT5gvUFcJr/bDCzO2PSAD9pIxSqmEvSnkktXyZvMWDlBaux4ukUJh
+r3v9DBN0fQUzYurn5JzalD55hlx2QhetQkbSjTaigLhgzEYGy+flD/igbCliwu4O
+jrJ4cqJs72Glk8I1Z6vN67Lwd8how0IZN+Z2zwKIy+7Y4ceWJffx3b+t85piJ/pV
+eZEVTB9q0GiuovXbLyJFc9J+PyFYlBxZa2JJsgP24GiZPLJ3Ek0UbUYvrpjp0DZd
+opAIYeCM79FLjFLrv4V1pKi8tqnrd+n8zxlpzHMEHHWHRi8fvB5ncqp0eSP/v/hK
+IJ21zOQ5Eyui8oy3K4GM
+=sBi3
 -----END PGP SIGNATURE-----
diff --git a/jabber/index.md b/jabber/index.md
new file mode 100644
index 0000000..f3f52ba
--- /dev/null
+++ b/jabber/index.md
@@ -0,0 +1,36 @@
+---
+layout: default
+---
+# Public Jabber/XMPP server on graffen.dk
+
+I run a public Jabber/XMPP server that allows account registration.
+
+## To create a @graffen.dk account
+
+Registration is currently handled in-band by your Jabber/XMPP client itself.
+
+Simply add _username_@graffen.dk in your client and click "register" or check the box to "create this account on the server" to sign up.
+
+## Connection Information
+
+### Server
+
+* Internet: xmpp.graffen.dk
+* Tor: zga65yhclsgjvpby.onion
+
+### Security
+
+* Require SSL/TLS.
+* When connecting to the hidden service you will get a warning about the TLS certificate not matching the host name. This is OK. 
+
+## Secure Communication
+
+Enable [Off-The-Record](https://otr.cypherpunks.ca/) in your chat client to have secure end-to-end encrypted chats. Data transferred between your client and graffen.dk is also TLS encrypted. 
+
+### Multi-user chat
+
+You can create a group chatroom @conference.graffen.dk that any jabber user can join.
+
+### Federation
+
+graffen.dk allows federated connections to all other S2S jabber servers. You can chat with almost anyone that has a jabber account somewhere. Note that Google Talk (has this been deprecated yet?) doesn't support S2S connections.