diff --git a/doc/EN/index.org b/doc/EN/index.org
index 7cff5d658489a4a877024a6729b1052c7d29d953..0254c70e3b6c3c289f6e89456d9dc741fdbf971a 100644
--- a/doc/EN/index.org
+++ b/doc/EN/index.org
@@ -21,7 +21,7 @@ Check out the [[./apps.html][list of available apps]] and [[./faq.html][Frequent
 
 Disk images which can be cloned straight to USB or microSD drives are [[./downloads/v31][available here]].
 
-If you find bugs, or want to add a new app to this system see the [[./devguide.html][Developers Guide]] and [[./codeofconduct.html][Code of Conduct]]. There is a Matrix chat room available at *#fbone:matrix.freedombone.net*.
+If you find bugs, or want to add a new app to this system see the [[./devguide.html][Developers Guide]] and [[./codeofconduct.html][Code of Conduct]]. There is a Matrix chat room available at *#fbone:matrix.freedombone.net* and an XMPP channel at *support@chat.freedombone.net*.
 
 If you like this project and want to support continued development then [[./support.html][here's what to do]].
 
diff --git a/doc/EN/support.org b/doc/EN/support.org
index 0e45744699c1f530ab9db230ffc62fc99b501f41..0aa8fa741a5683770a0811163c1ac2d8fcd4b77f 100644
--- a/doc/EN/support.org
+++ b/doc/EN/support.org
@@ -21,7 +21,7 @@ This site can also be accessed via a Tor browser at *http://yjxlc3imv7obva4grjae
 #+attr_html: :width 60% :align center
 [[file:images/pubkey.png]]
 
-*XMPP:* bob@freedombone.net with OMEMO or OpenPGP
+*XMPP channel:* support@chat.freedombone.net
 
 *Matrix:* #fbone:matrix.freedombone.net
 
diff --git a/website/EN/index.html b/website/EN/index.html
index 4bbb72873278592cfbb154c9a159cf14ce123d96..6b562d8c8244a9fd20056186a254804f45eaff96 100644
--- a/website/EN/index.html
+++ b/website/EN/index.html
@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2018-04-15 Sun 18:59 -->
+<!-- 2018-05-13 Sun 11:58 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -265,7 +265,7 @@ Disk images which can be cloned straight to USB or microSD drives are <a href=".
 </p>
 
 <p>
-If you find bugs, or want to add a new app to this system see the <a href="./devguide.html">Developers Guide</a> and <a href="./codeofconduct.html">Code of Conduct</a>. There is a Matrix chat room available at <b>#fbone:matrix.freedombone.net</b>.
+If you find bugs, or want to add a new app to this system see the <a href="./devguide.html">Developers Guide</a> and <a href="./codeofconduct.html">Code of Conduct</a>. There is a Matrix chat room available at <b>#fbone:matrix.freedombone.net</b> and an XMPP channel at <b>support@chat.freedombone.net</b>.
 </p>
 
 <p>
diff --git a/website/EN/support.html b/website/EN/support.html
index c264011bedcad062e53b50d930954017d20a3a38..1616da5ffe1191f5ae8bedcfdc9363582d9206a8 100644
--- a/website/EN/support.html
+++ b/website/EN/support.html
@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2018-05-11 Fri 17:27 -->
+<!-- 2018-05-13 Sun 11:58 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -242,13 +242,13 @@ for the JavaScript code in this tag.
 </p>
 </div>
 
-<div id="outline-container-orgf724cf8" class="outline-2">
-<h2 id="orgf724cf8">Support</h2>
+<div id="outline-container-org2a35610" class="outline-2">
+<h2 id="org2a35610">Support</h2>
 </div>
 
-<div id="outline-container-orgc83c003" class="outline-2">
-<h2 id="orgc83c003">Contact details</h2>
-<div class="outline-text-2" id="text-orgc83c003">
+<div id="outline-container-orge2e7a53" class="outline-2">
+<h2 id="orge2e7a53">Contact details</h2>
+<div class="outline-text-2" id="text-orge2e7a53">
 <p>
 This site can also be accessed via a Tor browser at <b><a href="http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion">http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion</a></b>
 </p>
@@ -267,7 +267,7 @@ This site can also be accessed via a Tor browser at <b><a href="http://yjxlc3imv
 </div>
 
 <p>
-<b>XMPP:</b> bob@freedombone.net with OMEMO or OpenPGP
+<b>XMPP channel:</b> support@chat.freedombone.net
 </p>
 
 <p>
@@ -280,22 +280,22 @@ This site can also be accessed via a Tor browser at <b><a href="http://yjxlc3imv
 </div>
 </div>
 
-<div id="outline-container-orgbff7600" class="outline-2">
-<h2 id="orgbff7600">Things which would be nice to have</h2>
-<div class="outline-text-2" id="text-orgbff7600">
+<div id="outline-container-org6f7b25d" class="outline-2">
+<h2 id="org6f7b25d">Things which would be nice to have</h2>
+<div class="outline-text-2" id="text-org6f7b25d">
 </div>
-<div id="outline-container-orgc80da0b" class="outline-3">
-<h3 id="orgc80da0b">Ideas</h3>
-<div class="outline-text-3" id="text-orgc80da0b">
+<div id="outline-container-orga0bd65e" class="outline-3">
+<h3 id="orga0bd65e">Ideas</h3>
+<div class="outline-text-3" id="text-orga0bd65e">
 <p>
 Know of some fabulous web system which could run on Freedombone, but currently doesn't? Contact the above, and be prepared to make a compelling argument for why it should be included.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org4c61d84" class="outline-3">
-<h3 id="org4c61d84">Money</h3>
-<div class="outline-text-3" id="text-org4c61d84">
+<div id="outline-container-orgc0b3a8b" class="outline-3">
+<h3 id="orgc0b3a8b">Money</h3>
+<div class="outline-text-3" id="text-orgc0b3a8b">
 <p>
 At the present time this project is not seeking any funding. There is no crowdfunding campaign and no slick marketing video. Those aren't ruled out as future possibilities, but for now they're just not needed.
 </p>
@@ -306,35 +306,35 @@ If you find this project useful then you may wish to consider donating to <a hre
 </div>
 </div>
 
-<div id="outline-container-org45612ae" class="outline-3">
-<h3 id="org45612ae">Testing and reporting bugs</h3>
-<div class="outline-text-3" id="text-org45612ae">
+<div id="outline-container-orgdb6bdb7" class="outline-3">
+<h3 id="orgdb6bdb7">Testing and reporting bugs</h3>
+<div class="outline-text-3" id="text-orgdb6bdb7">
 <p>
 Testing of the install on different hardware. Also pentesting on test installations to find vulnerabilities.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org573e6df" class="outline-3">
-<h3 id="org573e6df">Web design and artwork</h3>
-<div class="outline-text-3" id="text-org573e6df">
+<div id="outline-container-org422b096" class="outline-3">
+<h3 id="org422b096">Web design and artwork</h3>
+<div class="outline-text-3" id="text-org422b096">
 <p>
 A better design for this website would be nice to have. Photos, icons or other artwork are all welcome. I've always liked the cartoon artwork of the <a href="https://www.mediagoblin.org/">Mediagoblin</a> project, and attractive graphics can help to get people initially interested.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org7dd2e41" class="outline-3">
-<h3 id="org7dd2e41">Howto videos</h3>
-<div class="outline-text-3" id="text-org7dd2e41">
+<div id="outline-container-orge5eac99" class="outline-3">
+<h3 id="orge5eac99">Howto videos</h3>
+<div class="outline-text-3" id="text-orge5eac99">
 <p>
 If you're good at making videos then a howto for installing Freedombone onto various types of hardware, or testing the mesh system in realistic/exotic scenarios would be good. You could even host videos on PeerTube or Mediagoblin.
 </p>
 </div>
 </div>
-<div id="outline-container-orgd17ce5b" class="outline-3">
-<h3 id="orgd17ce5b">More education and promotion</h3>
-<div class="outline-text-3" id="text-orgd17ce5b">
+<div id="outline-container-org1f0471f" class="outline-3">
+<h3 id="org1f0471f">More education and promotion</h3>
+<div class="outline-text-3" id="text-org1f0471f">
 
 <div class="figure">
 <p><img src="./images/educate.png" alt="educate.png" width="50%" align="center" />
@@ -351,18 +351,18 @@ Raising awareness beyond the near zero current level, overcoming fear and parano
 </div>
 </div>
 
-<div id="outline-container-orgc230168" class="outline-3">
-<h3 id="orgc230168">Translations</h3>
-<div class="outline-text-3" id="text-orgc230168">
+<div id="outline-container-orgee84413" class="outline-3">
+<h3 id="orgee84413">Translations</h3>
+<div class="outline-text-3" id="text-orgee84413">
 <p>
 To add translations modify the json files within the <b>locale</b> subdirectory. Then make a pull request on the <a href="https://github.com/bashrc/freedombone">Github site</a>.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org9271805" class="outline-3">
-<h3 id="org9271805">Packaging</h3>
-<div class="outline-text-3" id="text-org9271805">
+<div id="outline-container-orgf7fcec0" class="outline-3">
+<h3 id="orgf7fcec0">Packaging</h3>
+<div class="outline-text-3" id="text-orgf7fcec0">
 <p>
 Helping to package GNU Social and Hubzilla for Debian would be beneficial.
 </p>