diff --git a/Makefile b/Makefile
index 78d9f057..da797c21 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ install:
 	install -m 755 src/${APP}-unignore ${DESTDIR}${PREFIX}/bin
 	install -m 755 src/${APP}-addxmpp ${DESTDIR}${PREFIX}/bin
 	install -m 755 src/${APP}-rmxmpp ${DESTDIR}${PREFIX}/bin
+	install -m 755 src/${APP}-xmpp-pass ${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
@@ -43,6 +44,7 @@ install:
 	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
 	install -m 644 man/${APP}-rmxmpp.1.gz ${DESTDIR}${PREFIX}/share/man/man1
+	install -m 644 man/${APP}-xmpp-pass.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
@@ -60,6 +62,7 @@ uninstall:
 	rm -f ${PREFIX}/share/man/man1/${APP}-unignore.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-addxmpp.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-rmxmpp.1.gz
+	rm -f ${PREFIX}/share/man/man1/${APP}-xmpp-pass.1.gz
 	rm -rf ${PREFIX}/share/${APP}
 	rm -f ${PREFIX}/bin/${APP}
 	rm -f ${PREFIX}/bin/${APP}-prep
@@ -76,6 +79,7 @@ uninstall:
 	rm -f ${PREFIX}/bin/${APP}-unignore
 	rm -f ${PREFIX}/bin/${APP}-addxmpp
 	rm -f ${PREFIX}/bin/${APP}-rmxmpp
+	rm -f ${PREFIX}/bin/${APP}-xmpp-pass
 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 43cc1edf..adf2df5d 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -14,3 +14,4 @@ man/freedombone-ignore.1.gz
 man/freedombone-unignore.1.gz
 man/freedombone-addxmpp.1.gz
 man/freedombone-rmxmpp.1.gz
+man/freedombone-xmpp-pass.1.gz
diff --git a/man/freedombone-xmpp-pass.1.gz b/man/freedombone-xmpp-pass.1.gz
new file mode 100644
index 00000000..754e06f9
Binary files /dev/null and b/man/freedombone-xmpp-pass.1.gz differ
diff --git a/src/freedombone-xmpp-pass b/src/freedombone-xmpp-pass
new file mode 100755
index 00000000..37a049be
--- /dev/null
+++ b/src/freedombone-xmpp-pass
@@ -0,0 +1,66 @@
+#!/bin/bash
+#
+# .---.                  .              .
+# |                      |              |
+# |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
+# |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
+# '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
+#
+#                    Freedom in the Cloud
+#
+
+# Changes the password for 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-xmpp-pass -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 passwd $EMAIL_ADDRESS
+
+exit 0