diff --git a/Makefile b/Makefile
index 0ea6d413..9caadb9d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ install:
 	install -m 755 src/${APP}-rmemail ${DESTDIR}${PREFIX}/bin
 	install -m 755 src/${APP}-ignore ${DESTDIR}${PREFIX}/bin
 	install -m 755 src/${APP}-unignore ${DESTDIR}${PREFIX}/bin
+	install -m 755 src/${APP}-addxmpp ${DESTDIR}${PREFIX}/bin
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}-prep.1.gz ${DESTDIR}${PREFIX}/share/man/man1
@@ -39,6 +40,7 @@ install:
 	install -m 644 man/${APP}-rmemail.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}-ignore.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}-unignore.1.gz ${DESTDIR}${PREFIX}/share/man/man1
+	install -m 644 man/${APP}-addxmpp.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 uninstall:
 	rm -f ${PREFIX}/share/man/man1/${APP}.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-prep.1.gz
@@ -54,6 +56,7 @@ uninstall:
 	rm -f ${PREFIX}/share/man/man1/${APP}-rmemail.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-ignore.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-unignore.1.gz
+	rm -f ${PREFIX}/share/man/man1/${APP}-addxmpp.1.gz
 	rm -rf ${PREFIX}/share/${APP}
 	rm -f ${PREFIX}/bin/${APP}
 	rm -f ${PREFIX}/bin/${APP}-prep
@@ -68,6 +71,7 @@ uninstall:
 	rm -f ${PREFIX}/bin/${APP}-rmlist
 	rm -f ${PREFIX}/bin/${APP}-ignore
 	rm -f ${PREFIX}/bin/${APP}-unignore
+	rm -f ${PREFIX}/bin/${APP}-addxmpp
 clean:
 	rm -f \#* \.#* debian/*.substvars debian/*.log
 	rm -fr deb.* debian/${APP}
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index e3dd9c93..23981818 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -12,3 +12,4 @@ man/freedombone-rmlist.1.gz
 man/freedombone-rmemail.1.gz
 man/freedombone-ignore.1.gz
 man/freedombone-unignore.1.gz
+man/freedombone-addxmpp.1.gz
diff --git a/doc/EN/usage.org b/doc/EN/usage.org
index d92922d9..416c944a 100644
--- a/doc/EN/usage.org
+++ b/doc/EN/usage.org
@@ -410,7 +410,7 @@ To add a user:
 #+BEGIN_SRC bash
 ssh username@domainname -p 2222
 su
-prosodyctl adduser newusername@newdomainname
+freedombone-addxmpp -e newusername@newdomainname
 exit
 exit
 #+END_SRC
diff --git a/man/freedombone-addxmpp.1.gz b/man/freedombone-addxmpp.1.gz
new file mode 100644
index 00000000..ebcd8c10
Binary files /dev/null and b/man/freedombone-addxmpp.1.gz differ
diff --git a/src/freedombone-addxmpp b/src/freedombone-addxmpp
new file mode 100755
index 00000000..42944ae9
--- /dev/null
+++ b/src/freedombone-addxmpp
@@ -0,0 +1,66 @@
+#!/bin/bash
+#
+# .---.                  .              .
+# |                      |              |
+# |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
+# |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
+# '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
+#
+#                    Freedom in the Cloud
+#
+
+# Adds an xmpp user
+
+# License
+# =======
+#
+# Copyright (C) 2015 Bob Mottram <bob@robotics.uk.to>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+EMAIL_ADDRESS=
+
+function show_help {
+    echo ''
+    echo 'freedombone-addxmpp -e [email address]'
+    echo ''
+    exit 0
+}
+
+while [[ $# > 1 ]]
+do
+key="$1"
+
+case $key in
+    -h|--help)
+    show_help
+    ;;
+    -e|--email)
+    shift
+    EMAIL_ADDRESS="$1"
+    ;;
+    *)
+    # unknown option
+    ;;
+esac
+shift
+done
+
+if [ ! $EMAIL_ADDRESS ]; then
+    show_help
+fi
+
+prosodyctl adduser $EMAIL_ADDRESS
+
+exit 0
diff --git a/website/EN/usage.html b/website/EN/usage.html
index 0d7e8a75..a6be2a87 100644
--- a/website/EN/usage.html
+++ b/website/EN/usage.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title></title>
-<!-- 2015-04-05 Sun 13:17 -->
+<!-- 2015-04-05 Sun 13:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <meta  name="author" content="Bob Mottram" />
@@ -1165,7 +1165,7 @@ To add a user:
 
 <pre class="src src-bash">ssh username@domainname -p 2222
 su
-prosodyctl adduser newusername@newdomainname
+freedombone-addxmpp -e newusername@newdomainname
 <span class="org-keyword">exit</span>
 <span class="org-keyword">exit</span>
 </pre>