diff --git a/doc/EN/faq.org b/doc/EN/faq.org
index 31b832b5..0d1c4868 100644
--- a/doc/EN/faq.org
+++ b/doc/EN/faq.org
@@ -1,7 +1,7 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
 #+EMAIL: bob@robotics.uk.to
-#+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
+#+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil
 #+BEGIN_CENTER
@@ -39,7 +39,7 @@ It was originally designed to run on the Beaglebone Black, but that should be re
 
 /Out of fashion/ but still working computer hardware tends to be cheap and readily available, yet still good for providing internet services.
 * Can I add more users to the system?
-Like any other GNU/Linux system you can add more users. It's easy to add users to Owncloud, XMPP or RedMatrix. However, Freedombone is designed primarily to be a single user system (i.e. a personal server) and if there are multiple users then the number of them is expected to be small - perhaps five or less. Freedombone is not intended to be "/web scale/" in terms of supporting tens or hundreds of users on a single server. Instead, each server can host a small number of users and then the servers federate together as a network of peers.
+Like any other GNU/Linux system you can add more users. It's easy to add users to Owncloud, XMPP or Hubzilla. However, Freedombone is designed primarily to be a single user system (i.e. a personal server) and if there are multiple users then the number of them is expected to be small - perhaps five or less. Freedombone is not intended to be "/web scale/" in terms of supporting tens or hundreds of users on a single server. Instead, each server can host a small number of users and then the servers federate together as a network of peers.
 * How do I reset the tripwire?
 You will get a daily email which indicates which files on the system have changed recently. Once per week the system will install any updates and those may also show up on the list, along with any changes due to installed packages or changed settings. Watch out for any files which change unexpectedly, which could indicate an intruder. To reset the tripwire:
 
@@ -281,7 +281,7 @@ Save and exit, then restart the web server.
 service nginx restart
 #+END_SRC
 
-Now visit your web site at https://mydomainname.com and you should notice that there is no certificate warning displayed.  You will now be able to install systems which don't allow the use of self-signed certificates, such as [[https://redmatrix.me/&JS=1][Red Matrix]].
+Now visit your web site at https://mydomainname.com and you should notice that there is no certificate warning displayed.  You will now be able to install systems which don't allow the use of self-signed certificates, such as [[https://github.com/redmatrix/hubzilla][Hubzilla]].
 
 * How do I renew a StartSSL certificate?
 The StartSSL certificates last for a year. You can check the expiry date of your current certificate/s by going to your site and if you're using Firefox then click on the *lock icon*, select "*more information*" then "*view certificate*".
diff --git a/doc/EN/installation.org b/doc/EN/installation.org
index 42db13ce..fce338b9 100644
--- a/doc/EN/installation.org
+++ b/doc/EN/installation.org
@@ -1,7 +1,7 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
 #+EMAIL: bob@robotics.uk.to
-#+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
+#+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil
 #+BEGIN_CENTER
@@ -22,7 +22,7 @@ To get started you will need:
  - Access to the internet via a router with ethernet sockets
  - USB thumb drive (for backups or storing media)
  - One or more domains available via a dynamic DNS provider, such as https://freedns.afraid.org
- - A purchased domain name and SSL certificate (only needed for Red Matrix)
+ - A purchased domain name and SSL certificate (only needed for Hubzilla)
  - A laptop or desktop machine with the ability to write to a microSD card (might need an adaptor)
 
 You will also need to know, or find out, the IP address of your internet router and have a suitable static IP address for the Beaglebone on your local network. The router should allow you to forward ports to the Beaglebone (often this is under firewall or "advanced" settings).
@@ -118,7 +118,7 @@ WIKI_DOMAIN_NAME=mywikidomain
 MY_BLOG_TITLE=my blog
 FULLBLOG_DOMAIN_NAME=myblogdomain
 MICROBLOG_DOMAIN_NAME=mymicroblogdomain
-REDMATRIX_DOMAIN_NAME=myredmatrixdomain
+HUBZILLA_DOMAIN_NAME=myhubzilladomain
 OWNCLOUD_DOMAIN_NAME=myownclouddomain
 HWRNG_TYPE=haveged
 ENABLE_SOCIAL_KEY_MANAGEMENT="no"
diff --git a/doc/EN/related.org b/doc/EN/related.org
index bbf547cb..01436877 100644
--- a/doc/EN/related.org
+++ b/doc/EN/related.org
@@ -1,7 +1,7 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
 #+EMAIL: bob@robotics.uk.to
-#+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
+#+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil
 #+BEGIN_CENTER
@@ -27,7 +27,7 @@ The following projects made Freedombone possible.
 #+END_CENTER
 #+BEGIN_CENTER
 [[http://gnu.io][file:images/gnusocial.png]]
-[[https://redmatrix.me/][file:images/redmatrix.png]]
+[[https://github.com/redmatrix/hubzilla][file:images/hubzilla.png]]
 #+END_CENTER
 #+BEGIN_CENTER
 [[https://prosody.im][file:images/prosody.png]]
diff --git a/doc/EN/usage.org b/doc/EN/usage.org
index dd39e1e0..16c88024 100644
--- a/doc/EN/usage.org
+++ b/doc/EN/usage.org
@@ -1,7 +1,7 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
 #+EMAIL: bob@robotics.uk.to
-#+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
+#+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil
 #+BEGIN_CENTER
@@ -364,16 +364,16 @@ When the install is complete you will see a lot of warnings but just ignore thos
 | Access settings | /Invite only/ ticked             |
 * Social Network
 ** Certificates
-You will need to have a non self-signed SSL certificate in order to use Red Matrix. Put the public certificate in */etc/ssl/certs/yourredmatrixdomainname.crt* and the private certificate in */etc/ssl/private/yourredmatrixdomainname.key*. If there is an intermediate certificate needed (such as with StartSSL) then this will need to be concatenated onto the end of the crt file, like this:
+You will need to have a non self-signed SSL certificate in order to use Hubzilla. Put the public certificate in */etc/ssl/certs/yourhubzilladomainname.crt* and the private certificate in */etc/ssl/private/yourhubzilladomainname.key*. If there is an intermediate certificate needed (such as with StartSSL) then this will need to be concatenated onto the end of the crt file, like this:
 
 #+BEGIN_SRC bash
-cat /etc/ssl/certs/yourredmatrixdomainname.crt /etc/ssl/chains/startssl-sub.class1.server.ca.pem >
- /etc/ssl/certs/yourredmatrixdomainname.bundle.crt
+cat /etc/ssl/certs/yourhubzilladomainname.crt /etc/ssl/chains/startssl-sub.class1.server.ca.pem >
+ /etc/ssl/certs/yourhubzilladomainname.bundle.crt
 #+END_SRC
 
-Then change ssl_certificate to */etc/ssl/certs/yourredmatrixdomainname.bundle.crt* within */etc/nginx/sites-available/yourredmatrixdomainname*
+Then change ssl_certificate to */etc/ssl/certs/yourhubzilladomainname.bundle.crt* within */etc/nginx/sites-available/yourhubzilladomainname*
 ** Initial install
-Visit the URL of your Red Matrix site and you should be taken through the rest of the installation procedure.  Note that this may take a few minutes so don't be concerned if it looks as if it has crashed - just leave it running.
+Visit the URL of your Hubzilla site and you should be taken through the rest of the installation procedure.  Note that this may take a few minutes so don't be concerned if it looks as if it has crashed - just leave it running.
 
 When installation is complete you can register a new user.
 * Chat Services
diff --git a/website/EN/faq.html b/website/EN/faq.html
index 513ca887..22aabc30 100644
--- a/website/EN/faq.html
+++ b/website/EN/faq.html
@@ -4,13 +4,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title></title>
-<!-- 2015-07-10 Fri 11:22 -->
+<!-- 2015-09-08 Tue 19:27 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <meta  name="author" content="Bob Mottram" />
 <meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta  name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <meta  name="viewport" content="width=device-width, initial-scale=1" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
@@ -273,7 +273,7 @@ It was originally designed to run on the Beaglebone Black, but that should be re
 <h2 id="orgheadline4">Can I add more users to the system?</h2>
 <div class="outline-text-2" id="text-orgheadline4">
 <p>
-Like any other GNU/Linux system you can add more users. It's easy to add users to Owncloud, XMPP or RedMatrix. However, Freedombone is designed primarily to be a single user system (i.e. a personal server) and if there are multiple users then the number of them is expected to be small - perhaps five or less. Freedombone is not intended to be "<i>web scale</i>" in terms of supporting tens or hundreds of users on a single server. Instead, each server can host a small number of users and then the servers federate together as a network of peers.
+Like any other GNU/Linux system you can add more users. It's easy to add users to Owncloud, XMPP or Hubzilla. However, Freedombone is designed primarily to be a single user system (i.e. a personal server) and if there are multiple users then the number of them is expected to be small - perhaps five or less. Freedombone is not intended to be "<i>web scale</i>" in terms of supporting tens or hundreds of users on a single server. Instead, each server can host a small number of users and then the servers federate together as a network of peers.
 </p>
 </div>
 </div>
@@ -691,7 +691,7 @@ Save and exit, then restart the web server.
 </div>
 
 <p>
-Now visit your web site at <a href="https://mydomainname.com/">https://mydomainname.com/</a> and you should notice that there is no certificate warning displayed.  You will now be able to install systems which don't allow the use of self-signed certificates, such as <a href="https://redmatrix.me/&amp;JS=1">Red Matrix</a>.
+Now visit your web site at <a href="https://mydomainname.com/">https://mydomainname.com/</a> and you should notice that there is no certificate warning displayed.  You will now be able to install systems which don't allow the use of self-signed certificates, such as <a href="https://github.com/redmatrix/hubzilla">Hubzilla</a>.
 </p>
 </div>
 </div>
diff --git a/website/EN/installation.html b/website/EN/installation.html
index 4e7a39c7..b538388d 100644
--- a/website/EN/installation.html
+++ b/website/EN/installation.html
@@ -4,13 +4,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title></title>
-<!-- 2015-09-05 Sat 14:16 -->
+<!-- 2015-09-08 Tue 19:36 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <meta  name="author" content="Bob Mottram" />
 <meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta  name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <meta  name="viewport" content="width=device-width, initial-scale=1" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
@@ -218,7 +218,7 @@ To get started you will need:
 <li>Access to the internet via a router with ethernet sockets</li>
 <li>USB thumb drive (for backups or storing media)</li>
 <li>One or more domains available via a dynamic DNS provider, such as <a href="https://freedns.afraid.org/">https://freedns.afraid.org/</a></li>
-<li>A purchased domain name and SSL certificate (only needed for Red Matrix)</li>
+<li>A purchased domain name and SSL certificate (only needed for Hubzilla)</li>
 <li>A laptop or desktop machine with the ability to write to a microSD card (might need an adaptor)</li>
 </ul>
 
@@ -370,7 +370,7 @@ Add the following, and set the values as needed. DEFAULT_DOMAIN_NAME is where yo
 <span class="org-variable-name">MY_BLOG_TITLE</span>=my blog
 <span class="org-variable-name">FULLBLOG_DOMAIN_NAME</span>=myblogdomain
 <span class="org-variable-name">MICROBLOG_DOMAIN_NAME</span>=mymicroblogdomain
-<span class="org-variable-name">REDMATRIX_DOMAIN_NAME</span>=myredmatrixdomain
+<span class="org-variable-name">HUBZILLA_DOMAIN_NAME</span>=myhubzilladomain
 <span class="org-variable-name">OWNCLOUD_DOMAIN_NAME</span>=myownclouddomain
 <span class="org-variable-name">HWRNG_TYPE</span>=haveged
 <span class="org-variable-name">ENABLE_SOCIAL_KEY_MANAGEMENT</span>=<span class="org-string">"no"</span>
diff --git a/website/EN/related.html b/website/EN/related.html
index b0dc28b2..77dbcbce 100644
--- a/website/EN/related.html
+++ b/website/EN/related.html
@@ -4,25 +4,32 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title></title>
-<!-- 2014-10-26 Sun 20:49 -->
+<!-- 2015-09-08 Tue 19:34 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <meta  name="author" content="Bob Mottram" />
 <meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta  name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta  name="viewport" content="width=device-width, initial-scale=1" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
-  .title  { text-align: center; }
+  .title  { text-align: center;
+             margin-bottom: .2em; }
+  .subtitle { text-align: center;
+              font-size: medium;
+              font-weight: bold;
+              margin-top:0; }
   .todo   { font-family: monospace; color: red; }
-  .done   { color: green; }
+  .done   { font-family: monospace; color: green; }
+  .priority { font-family: monospace; color: orange; }
   .tag    { background-color: #eee; font-family: monospace;
             padding: 2px; font-size: 80%; font-weight: normal; }
   .timestamp { color: #bebebe; }
   .timestamp-kwd { color: #5f9ea0; }
-  .right  { margin-left: auto; margin-right: 0px;  text-align: right; }
-  .left   { margin-left: 0px;  margin-right: auto; text-align: left; }
-  .center { margin-left: auto; margin-right: auto; text-align: center; }
+  .org-right  { margin-left: auto; margin-right: 0px;  text-align: right; }
+  .org-left   { margin-left: 0px;  margin-right: auto; text-align: left; }
+  .org-center { margin-left: auto; margin-right: auto; text-align: center; }
   .underline { text-decoration: underline; }
   #postamble p, #preamble p { font-size: 90%; margin: .2em; }
   p.verse { margin-left: 3%; }
@@ -61,12 +68,12 @@
   caption.t-above { caption-side: top; }
   caption.t-bottom { caption-side: bottom; }
   td, th { vertical-align:top;  }
-  th.right  { text-align: center;  }
-  th.left   { text-align: center;   }
-  th.center { text-align: center; }
-  td.right  { text-align: right;  }
-  td.left   { text-align: left;   }
-  td.center { text-align: center; }
+  th.org-right  { text-align: center;  }
+  th.org-left   { text-align: center;   }
+  th.org-center { text-align: center; }
+  td.org-right  { text-align: right;  }
+  td.org-left   { text-align: left;   }
+  td.org-center { text-align: center; }
   dt { font-weight: bold; }
   .footpara:nth-child(2) { display: inline; }
   .footpara { display: block; }
@@ -147,7 +154,6 @@ for the JavaScript code in this tag.
 <a name="top" id="top"></a>
 </div>
 <div id="content">
-<h1 class="title"></h1>
 <div class="center">
 
 <div class="figure">
@@ -160,11 +166,11 @@ for the JavaScript code in this tag.
 
 
 <colgroup>
-<col  class="left" />
+<col  class="org-left" />
 </colgroup>
 <tbody>
 <tr>
-<td class="left"><a href="index.html">Home</a></td>
+<td class="org-left"><a href="index.html">Home</a></td>
 </tr>
 </tbody>
 </table>
@@ -193,7 +199,7 @@ The following projects made Freedombone possible.
 <div class="center">
 <p>
 <a href="http://gnu.io/"><img src="images/gnusocial.png" alt="gnusocial.png" /></a>
-<a href="https://redmatrix.me/"><img src="images/redmatrix.png" alt="redmatrix.png" /></a>
+<a href="https://github.com/redmatrix/hubzilla"><img src="images/hubzilla.png" alt="hubzilla.png" /></a>
 </p>
 </div>
 <div class="center">
diff --git a/website/EN/usage.html b/website/EN/usage.html
index 0672c391..6a8b8c1e 100644
--- a/website/EN/usage.html
+++ b/website/EN/usage.html
@@ -4,13 +4,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title></title>
-<!-- 2015-07-11 Sat 12:51 -->
+<!-- 2015-09-08 Tue 19:29 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <meta  name="author" content="Bob Mottram" />
 <meta  name="description" content="Turn the Beaglebone Black into a personal communications server"
  />
-<meta  name="keywords" content="freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
+<meta  name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
 <meta  name="viewport" content="width=device-width, initial-scale=1" />
 <style type="text/css">
  <!--/*--><![CDATA[/*><!--*/
@@ -1074,18 +1074,18 @@ When the install is complete you will see a lot of warnings but just ignore thos
 <h3 id="orgheadline32">Certificates</h3>
 <div class="outline-text-3" id="text-orgheadline32">
 <p>
-You will need to have a non self-signed SSL certificate in order to use Red Matrix. Put the public certificate in <b>/etc/ssl/certs/yourredmatrixdomainname.crt</b> and the private certificate in <b>/etc/ssl/private/yourredmatrixdomainname.key</b>. If there is an intermediate certificate needed (such as with StartSSL) then this will need to be concatenated onto the end of the crt file, like this:
+You will need to have a non self-signed SSL certificate in order to use Hubzilla. Put the public certificate in <b>/etc/ssl/certs/yourhubzilladomainname.crt</b> and the private certificate in <b>/etc/ssl/private/yourhubzilladomainname.key</b>. If there is an intermediate certificate needed (such as with StartSSL) then this will need to be concatenated onto the end of the crt file, like this:
 </p>
 
 <div class="org-src-container">
 
-<pre class="src src-bash">cat /etc/ssl/certs/yourredmatrixdomainname.crt /etc/ssl/chains/startssl-sub.class1.server.ca.pem &gt;
- /etc/ssl/certs/yourredmatrixdomainname.bundle.crt
+<pre class="src src-bash">cat /etc/ssl/certs/yourhubzilladomainname.crt /etc/ssl/chains/startssl-sub.class1.server.ca.pem &gt;
+ /etc/ssl/certs/yourhubzilladomainname.bundle.crt
 </pre>
 </div>
 
 <p>
-Then change ssl_certificate to <b>/etc/ssl/certs/yourredmatrixdomainname.bundle.crt</b> within <b>/etc/nginx/sites-available/yourredmatrixdomainname</b>
+Then change ssl_certificate to <b>/etc/ssl/certs/yourhubzilladomainname.bundle.crt</b> within <b>/etc/nginx/sites-available/yourhubzilladomainname</b>
 </p>
 </div>
 </div>
@@ -1093,7 +1093,7 @@ Then change ssl_certificate to <b>/etc/ssl/certs/yourredmatrixdomainname.bundle.
 <h3 id="orgheadline33">Initial install</h3>
 <div class="outline-text-3" id="text-orgheadline33">
 <p>
-Visit the URL of your Red Matrix site and you should be taken through the rest of the installation procedure.  Note that this may take a few minutes so don't be concerned if it looks as if it has crashed - just leave it running.
+Visit the URL of your Hubzilla site and you should be taken through the rest of the installation procedure.  Note that this may take a few minutes so don't be concerned if it looks as if it has crashed - just leave it running.
 </p>
 
 <p>