diff --git a/Makefile b/Makefile
index e76fab0c..cc2ff645 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ source:
 install:
 	mkdir -p ${DESTDIR}${PREFIX}/bin
 	install -m 755 src/${APP} ${DESTDIR}${PREFIX}/bin
+	install -m 755 src/${APP}-keydrive ${DESTDIR}${PREFIX}/bin
 	install -m 755 src/${APP}-splitkey ${DESTDIR}${PREFIX}/bin
 	install -m 755 src/${APP}-recoverkey ${DESTDIR}${PREFIX}/bin
 	install -m 755 src/${APP}-prep ${DESTDIR}${PREFIX}/bin
@@ -32,6 +33,7 @@ install:
 	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}-keydrive.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}-splitkey.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}-recoverkey.1.gz ${DESTDIR}${PREFIX}/share/man/man1
 	install -m 644 man/${APP}-prep.1.gz ${DESTDIR}${PREFIX}/share/man/man1
@@ -53,6 +55,7 @@ install:
 	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}-keydrive.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-splitkey.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-recoverkey.1.gz
 	rm -f ${PREFIX}/share/man/man1/${APP}-prep.1.gz
@@ -74,6 +77,7 @@ uninstall:
 	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}-keydrive
 	rm -f ${PREFIX}/bin/${APP}-splitkey
 	rm -f ${PREFIX}/bin/${APP}-recoverkey
 	rm -f ${PREFIX}/bin/${APP}-prep
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index ad68c034..9d02403e 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1,4 +1,5 @@
 man/freedombone.1.gz
+man/freedombone-keydrive.1.gz
 man/freedombone-splitkey.1.gz
 man/freedombone-recoverkey.1.gz
 man/freedombone-prep.1.gz
diff --git a/man/freedombone-keydrive.1.gz b/man/freedombone-keydrive.1.gz
new file mode 100644
index 00000000..72f0942f
Binary files /dev/null and b/man/freedombone-keydrive.1.gz differ
diff --git a/src/freedombone-keydrive b/src/freedombone-keydrive
new file mode 100755
index 00000000..88768305
--- /dev/null
+++ b/src/freedombone-keydrive
@@ -0,0 +1,192 @@
+#!/bin/bash
+#
+# .---.                  .              .
+# |                      |              |
+# |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
+# |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
+# '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
+#
+#                    Freedom in the Cloud
+#
+# Makes a USB drive containing a gpg key fragment
+#
+# 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/>.
+
+
+USB_DRIVE=/dev/sdb1
+USB_MOUNT=/mnt/usb
+FRAGMENTS_DIR=$USB_MOUNT/.gnupg_fragments
+MY_USERNAME=$USER
+MASTER_DRIVE="no"
+
+function show_help {
+    echo ''
+    echo 'freedombone-keydrive -u [username] -d [device, eg. sdb] --master [yes/no]'
+    echo ''
+    exit 0
+}
+
+while [[ $# > 1 ]]
+do
+key="$1"
+
+case $key in
+    -h|--help)
+    show_help
+    ;;
+    -u|--user)
+    shift
+    MY_USERNAME="$1"
+    ;;
+    -d|--dev)
+    shift
+    USB_DRIVE=/dev/${1}1
+    echo $USB_DRIVE
+    ;;
+    -m|--master)
+    shift
+    MASTER_DRIVE="$1"
+    ;;
+    *)
+    # unknown option
+    ;;
+esac
+shift
+done
+
+if [ ! $MY_USERNAME ]; then
+    echo 'No username given'
+    exit 69350
+fi
+
+if [ ! -d /home/$MY_USERNAME ]; then
+    echo "Home directory for $MY_USERNAME not found. This user may not exist on the system"
+    exit 72378
+fi
+
+if [ ! -b $USB_DRIVE ]; then
+  echo 'Please attach a USB drive'
+  exit 65743
+fi
+
+umount -f $USB_MOUNT
+if [ ! -d $USB_MOUNT ]; then
+  mkdir $USB_MOUNT
+fi
+if [ -f /dev/mapper/encrypted_usb ]; then
+  rm -rf /dev/mapper/encrypted_usb
+fi
+cryptsetup luksClose encrypted_usb
+cryptsetup luksOpen $USB_DRIVE encrypted_usb
+if [ "$?" = "0" ]; then
+  USB_DRIVE=/dev/mapper/encrypted_usb
+fi
+echo -n "mount $USB_DRIVE"
+if [ ! "$?" = "0" ]; then
+  echo "There was a problem mounting the USB drive to $USB_MOUNT"
+  rm -rf $USB_MOUNT
+  exit 78543
+fi
+
+# optionally create a master drive which contains the full GPG keyring
+if [[ $MASTER_DRIVE == "yes" || $MASTER_DRIVE == "y" || $MASTER_DRIVE == "1" ]]; then
+  if [ ! -d /home/$MY_USERNAME/.gnupg ]; then
+      echo "No .gnupg directory was found for $MY_USERNAME"
+      umount $USB_MOUNT
+      rm -rf $USB_MOUNT
+      exit 73025
+  fi
+  cp -rf /home/$MY_USERNAME/.gnupg $USB_MOUNT
+  if [ -d $USB_MOUNT/.gnupg ]; then
+      echo "GPG Keyring copied to $USB_DRIVE. You may now remove the drive."
+  else
+      echo "Unable to copy gpg keyring to $USB_DRIVE"
+  fi
+  umount $USB_MOUNT
+  rm -rf $USB_MOUNT
+  exit 0
+fi
+
+# Append the username as a subdirectory.
+# This has a down side in that it does identify a given fragment
+# as belonging to a given user, but has the convenience upside
+# of being able to carry key fragments for multiple friends on
+# the same USB drive
+FRAGMENTS_DIR=$FRAGMENTS_DIR/$MY_USERNAME
+
+# make a directory to contain the fragments
+if [ ! -d $FRAGMENTS_DIR ]; then
+  mkdir -p $FRAGMENTS_DIR
+fi
+if [ ! -d $FRAGMENTS_DIR ]; then
+  echo "There was a problem making the directory $FRAGMENTS_DIR"
+  umount $USB_MOUNT
+  rm -rf $USB_MOUNT
+  exit 6843
+fi
+
+no_of_usb_shares=$(ls -afq $FRAGMENTS_DIR/keyshare.asc.* | wc -l)
+no_of_usb_shares=$((no_of_usb_shares - 2))
+if [[ ${no_of_usb_shares} > 0 ]]; then
+  echo "A key fragment already exists on the drive for the user $MY_USERNAME"
+  umount $USB_MOUNT
+  rm -rf $USB_MOUNT
+  exit 58945
+fi
+
+# copy a random fragment to the drive
+LOCAL_FRAGMENTS_DIR=/home/$MY_USERNAME/.gnupg_fragments
+cd $LOCAL_FRAGMENTS_DIR
+
+if [ ! -d $LOCAL_FRAGMENTS_DIR ]; then
+    freedombone-splitkey -u $MY_USERNAME
+fi
+
+no_of_local_shares=$(ls -afq $LOCAL_FRAGMENTS_DIR/keyshare.asc.* | wc -l)
+no_of_local_shares=$((no_of_shares - 2))
+if [[ ${no_of_local_shares} < 3 ]]; then
+    freedombone-splitkey -u $MY_USERNAME
+    no_of_local_shares=$(ls -afq $LOCAL_FRAGMENTS_DIR/keyshare.asc.* | wc -l)
+    no_of_local_shares=$((no_of_shares - 2))
+fi
+
+if [[ ${no_of_local_shares} < 3 ]]; then
+    echo 'Not enough key fragments available'
+    umount $USB_MOUNT
+    rm -rf $USB_MOUNT
+    exit 63386
+fi
+
+share_files=($LOCAL_FRAGMENTS_DIR/keyshare.asc.*)
+SHARE_FILENAME=${files[RANDOM % ${#share_files[@]}]}
+
+cp -f $SHARE_FILENAME $FRAGMENTS_DIR
+no_of_usb_shares=$(ls -afq $FRAGMENTS_DIR/keyshare.asc.* | wc -l)
+no_of_usb_shares=$((no_of_usb_shares - 2))
+if [[ ${no_of_usb_shares} != 1 ]]; then
+    echo "There was a problem copying the key fragment to $USB_DRIVE"
+    umount $USB_MOUNT
+    rm -rf $USB_MOUNT
+    exit 54292
+fi
+umount $USB_MOUNT
+rm -rf $USB_MOUNT
+echo "Key fragment copied to $USB_DRIVE. You may now remove the drive."
+
+exit 0